Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jan 2012 16:01:59 +0000 (08:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jan 2012 16:01:59 +0000 (08:01 -0800)
commit1483b3823542c9721eddf09a077af1e02ac96b50
tree390dcff4ddfb8634ad62c7fc9c3c9d0e802e9c1e
parent4a2164a7dbf0d3b6a1c2ef6f20c0d54350491a12
parent1a9a8aefa8f0530c97f4606ab7a2fc01fe31e9c1
Merge branch 'core-printk-for-linus' of git://git./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()
kernel/printk.c