diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 08:01:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 08:01:59 -0800 |
| commit | 1483b3823542c9721eddf09a077af1e02ac96b50 (patch) | |
| tree | 390dcff4ddfb8634ad62c7fc9c3c9d0e802e9c1e /include/trace/events | |
| parent | 4a2164a7dbf0d3b6a1c2ef6f20c0d54350491a12 (diff) | |
| parent | 1a9a8aefa8f0530c97f4606ab7a2fc01fe31e9c1 (diff) | |
Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
printk, lockdep: Switch to tracked irq ops
printk, lockdep: Remove superfluous preempt_disable()
printk, lockdep: Disable lock debugging on zap_locks()
Diffstat (limited to 'include/trace/events')
0 files changed, 0 insertions, 0 deletions