summaryrefslogtreecommitdiff
path: root/init/main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-01-31 10:04:46 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-01-31 10:04:46 +0400
commit0fe94b9e56da7ebffad4422415bdc2854934a389 (patch)
treea56b2dc6d4b714d03e0e3ba453e52a4addd06344 /init/main.c
parenta56e16009855b2b528c36aa56b7ab8b209bb15e0 (diff)
parentff0d05bf73620eb7dc8aee7423e992ef87870bdf (diff)
downloadlinux-0fe94b9e56da7ebffad4422415bdc2854934a389.tar.xz
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull console lockdep checking revert from Dave Airlie. The lockdep splat this showed was interesting, but it's very very old, and we won't be fixing it until 3.9. In the meantime, undo the lockdep annotation so that we don't generate the (known) console lockdep issue, and then possibly hide any potential other (unknown) lockdep problems that got disabled by the first one that triggered. * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: Revert "console: implement lockdep support for console_lock"
Diffstat (limited to 'init/main.c')
0 files changed, 0 insertions, 0 deletions