Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Apr 2009 00:21:20 +0000 (17:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Apr 2009 00:21:20 +0000 (17:21 -0700)
commit56a50adda49b2020156616c4eb15353e0f9ad7de
treea0453fde37538653628270258c3291d880a66853
parentc2e2ceeae4b5587d412c05cdc31513179d37811d
parent355d7f370b51bbb6f31aaf9f98861057e1e6bbb2
Merge branch 'drm-intel-next' of git://git./linux/kernel/git/anholt/drm-intel

* 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
  drm/i915: fix up error path leak in i915_cmdbuffer
  drm/i915: fix unpaired i915 device mutex on entervt failure.
  drm/i915: add support for G41 chipset
  drm/i915: Enable ASLE if present
  drm/i915: Unregister ACPI video driver when exiting
  drm/i915: Register ACPI video even when not modesetting
  drm/i915: fix transition to I915_TILING_NONE
  drm/i915: Don't let an oops get triggered from irq_emit without dma init.
  drm/i915: allow tiled front buffers on 965+
drivers/acpi/video.c