Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 14 Dec 2010 11:34:51 +0000 (11:34 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 14 Dec 2010 11:34:51 +0000 (11:34 +0000)
commit9097eef024db4f1850015e837a84aca0aa40a288
tree0d2cf4b9ca5e1e58aa38c1225338925e675c4a02
parentb13c2b96bf15b9dd0f1a45fd788f3a3025c5aec6
parent71f4566084eb592fe545f05f7dff41fa9aa42e0b
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/char/agp/intel-gtt.c