Merge branch 'fbcon-locking-fixes' of ssh://people.freedesktop.org/~airlied/linux...
authorDave Airlie <airlied@redhat.com>
Fri, 8 Feb 2013 02:10:18 +0000 (12:10 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 8 Feb 2013 02:10:18 +0000 (12:10 +1000)
commit6dc1c49da6dd3bf020a66b2a135b9625ac01c2c7
tree38a6c5d4896de01449e9d224088ae223161fcd3c
parentcd17ef4114ad5c514b17e6a0bb02a309ab90b692
parent5845b81bdad374f98f809a658ec747d92c9595c4
Merge branch 'fbcon-locking-fixes' of ssh://people.freedesktop.org/~airlied/linux into drm-next

This pulls in most of Linus tree up to -rc6, this fixes the worst lockdep
reported issues and re-enables fbcon lockdep.

(not the fbcon maintainer)
* 'fbcon-locking-fixes' of ssh://people.freedesktop.org/~airlied/linux: (529 commits)
  Revert "Revert "console: implement lockdep support for console_lock""
  fbcon: fix locking harder
  fb: Yet another band-aid for fixing lockdep mess
  fb: rework locking to fix lock ordering on takeover
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem_execbuffer.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/i915/intel_ringbuffer.c
drivers/gpu/drm/radeon/radeon_cursor.c
drivers/gpu/drm/radeon/radeon_display.c