Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Jul 2011 23:43:49 +0000 (16:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Jul 2011 23:43:49 +0000 (16:43 -0700)
commit391d6276db9fbdedfbc30e1b56390414f0e55988
treed22cd2482f5452d616ee981e954074ffc6ae094d
parent75b56ec294b074d70f8a676ab02611a3fea76cab
parentdd4e5d3ac4a76b868daf30e35bd572def96c30ed
Merge branch 'core-printk-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  lockdep: Fix trace_[soft,hard]irqs_[on,off]() recursion
  printk: Fix console_sem vs logbuf_lock unlock race
  printk: Release console_sem after logbuf_lock
kernel/lockdep.c