tree 2b46c8428c5b97405a5ddfc6303f18ae383e4f08
parent cdf0c7de29a87cc600ef367893523ea15938da4e
parent b60678a75d44fa9d5969f79781bd856ad5858609
author Linus Torvalds <torvalds@linux-foundation.org> 1228840059 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1228840059 -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: Disable the GM965 MSI errata workaround.
  drm/i915: Don't return error in evict_everything when we get to the end.
  drm/radeon: don't actually enable the IRQ regs until irq is enabled