]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keith...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Aug 2011 22:00:49 +0000 (15:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Aug 2011 22:00:49 +0000 (15:00 -0700)
commitb727d20269e8ef1de002bfea8099f5e9db9e9f23
treef0856689e20a0b9739d778b61cb2f907c911eb9f
parent7a54f5e19f90342340112939ef592fff20fc370c
parent0de3b4856907d9937c6c23cfbfdec1e8e3596ea7
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/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