Merge remote-tracking branch 'airlied/drm-core-next' into drm-nouveau-next
authorBen Skeggs <bskeggs@redhat.com>
Thu, 24 Feb 2011 20:17:07 +0000 (06:17 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Thu, 24 Feb 2011 20:17:07 +0000 (06:17 +1000)
commite11d57ca0b6dada29007ce3ad3db6c84034a768f
tree39ad0c208e2cb3da79f958bd0e9d0d12b8e5f8fe
parent317495b25ec1f0beb0dbac8ee0dfec59a1addf03
parenta2c06ee2fe5b48a71e697bae00c6e7195fc016b6
Merge remote-tracking branch 'airlied/drm-core-next' into drm-nouveau-next
drivers/gpu/drm/nouveau/nouveau_bios.c