diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 16:43:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 16:43:49 -0700 |
| commit | 391d6276db9fbdedfbc30e1b56390414f0e55988 (patch) | |
| tree | d22cd2482f5452d616ee981e954074ffc6ae094d /net | |
| parent | 75b56ec294b074d70f8a676ab02611a3fea76cab (diff) | |
| parent | dd4e5d3ac4a76b868daf30e35bd572def96c30ed (diff) | |
Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions