From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Aug 2011 22:00:49 +0000 (-0700)
Subject: Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keith... 
X-Git-Tag: v3.1-rc4~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b727d20269e8ef1de002bfea8099f5e9db9e9f23;p=platform%2Fkernel%2Flinux-stable.git

Merge branch 'drm-intel-fixes' of git://git./linux/kernel/git/keithp/linux-2.6

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
  drm/i915: Fix wrong initializer for "locked" variable in assert_panel_unlocked
  i915: do not setup intel_backlight twice
---

b727d20269e8ef1de002bfea8099f5e9db9e9f23