diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-02-08 03:10:18 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-02-08 03:10:18 +0100 |
| commit | 6dc1c49da6dd3bf020a66b2a135b9625ac01c2c7 (patch) | |
| tree | 38a6c5d4896de01449e9d224088ae223161fcd3c /net/mac80211/rc80211_pid.h | |
| parent | Merge tag 'drm-intel-next-2013-02-01' of git://people.freedesktop.org/~danvet... (diff) | |
| parent | Revert "Revert "console: implement lockdep support for console_lock"" (diff) | |
| download | linux-6dc1c49da6dd3bf020a66b2a135b9625ac01c2c7.tar.xz linux-6dc1c49da6dd3bf020a66b2a135b9625ac01c2c7.zip | |
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
Diffstat (limited to 'net/mac80211/rc80211_pid.h')
0 files changed, 0 insertions, 0 deletions