From: Dave Airlie Date: Fri, 8 Feb 2013 02:10:18 +0000 (+1000) Subject: Merge branch 'fbcon-locking-fixes' of ssh://people.freedesktop.org/~airlied/linux... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6dc1c49da6dd3bf020a66b2a135b9625ac01c2c7;p=linux-beck.git 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 --- 6dc1c49da6dd3bf020a66b2a135b9625ac01c2c7