From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Apr 2010 01:24:06 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt... 
X-Git-Tag: v2.6.34-rc6~62
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=7db2ccddd112d8b4b0d0dd7f309ebd8b39373fbb;p=safe%2Fjmp%2Flinux-2.6

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: use PIPE_CONTROL instruction on Ironlake and Sandy Bridge
  drm/i915: cleanup FBC buffers at unload time
  drm/i915: fix tiling limits for i915 class hw v2
  drm/i915: set DIDL using the ACPI video output device _ADR method return.
  drm/i915: Fix 82854 PCI ID, and treat it like other 85X
  drm/i915: Attempt to fix watermark setup on 85x (v2)
---

7db2ccddd112d8b4b0d0dd7f309ebd8b39373fbb