Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Mar 2011 04:02:32 +0000 (20:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Mar 2011 04:02:32 +0000 (20:02 -0800)
commitcbdbb4c1d22e26f9d5314fefe6f2c7e5ed7f6a0f
treebc5255afdf35de2541afa05a30a83b5d18818820
parentf7d222ea2ac7aebf1ac06a76e7739ed17480fd38
parent0366ebbf94cfafbdb1fd8c30da47a945294fe1a1
Merge branch 'drm-fixes' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/i915: fix memory corruption with GM965 and >4GB RAM