Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Dec 2008 00:45:13 +0000 (16:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Dec 2008 00:45:13 +0000 (16:45 -0800)
commitd9d060a98ff89fe0f86e24c9c0c3d2f0c566781c
tree8f56e9131504d738725cf040a30131456608901e
parent03cfdb86ac66677dbe76accae3f22c374a15b814
parent151903d5466fbcfb56ce792c3d5ea0ecbae15d07
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 copy'n'pasteo that broke VT switch if flushing was non-empty.