Merge remote-tracking branch 'airlied/drm-next' into drm-nouveau-next
authorBen Skeggs <bskeggs@redhat.com>
Mon, 8 Jul 2013 03:40:34 +0000 (13:40 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 8 Jul 2013 03:40:34 +0000 (13:40 +1000)

Trivial merge