From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Jan 2012 16:01:59 +0000 (-0800)
Subject: Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.3-rc1~194
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=1483b3823542c9721eddf09a077af1e02ac96b50

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()
---

1483b3823542c9721eddf09a077af1e02ac96b50