From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Feb 2010 21:01:39 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt... 
X-Git-Tag: v2.6.33-rc7~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f6510ec5a96d07897a109ad8919c6af5e9b3f4bc;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'for-linus' of git://git./linux/kernel/git/anholt/drm-intel

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
  drm/i915: Fix leak of relocs along do_execbuffer error path
  drm/i915: slow acpi_lid_open() causes flickering - V2
  drm/i915: Disable SR when more than one pipe is enabled
  drm/i915: page flip support for Ironlake
  drm/i915: Fix the incorrect DMI string for Samsung SX20S laptop
  drm/i915: Add support for SDVO composite TV
  drm/i915: don't trigger ironlake vblank interrupt at irq install
  drm/i915: handle non-flip pending case when unpinning the scanout buffer
  drm/i915: Fix the device info of Pineview
  drm/i915: enable vblank interrupt on ironlake
  drm/i915: Prevent use of uninitialized pointers along error path.
  drm/i915: disable hotplug detect before Ironlake CRT detect
---

f6510ec5a96d07897a109ad8919c6af5e9b3f4bc