tree 8f56e9131504d738725cf040a30131456608901e
parent 03cfdb86ac66677dbe76accae3f22c374a15b814
parent 151903d5466fbcfb56ce792c3d5ea0ecbae15d07
author Linus Torvalds <torvalds@linux-foundation.org> 1228092313 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1228092313 -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 copy'n'pasteo that broke VT switch if flushing was non-empty.