summaryrefslogtreecommitdiffstats
path: root/net/dccp
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-06 17:01:59 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-06 17:01:59 +0100
commit1483b3823542c9721eddf09a077af1e02ac96b50 (patch)
tree390dcff4ddfb8634ad62c7fc9c3c9d0e802e9c1e /net/dccp
parentMerge branch 'core-memblock-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff)
parentprintk, lockdep: Switch to tracked irq ops (diff)
downloadlinux-1483b3823542c9721eddf09a077af1e02ac96b50.tar.xz
linux-1483b3823542c9721eddf09a077af1e02ac96b50.zip
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 'net/dccp')
0 files changed, 0 insertions, 0 deletions