tree bc5255afdf35de2541afa05a30a83b5d18818820
parent f7d222ea2ac7aebf1ac06a76e7739ed17480fd38
parent 0366ebbf94cfafbdb1fd8c30da47a945294fe1a1
author Linus Torvalds <torvalds@linux-foundation.org> 1299124952 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1299124952 -0800

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/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