tree 23b2986db5c47a507039660091cd737506282b4a
parent a2b297ff56b9bad251d11a476880a5e4614cd92f
parent e552eb7038a36d9b18860f525aa02875e313fe16
author Linus Torvalds <torvalds@linux-foundation.org> 1271985846 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1271985846 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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)