Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Jun 2012 00:28:20 +0000 (17:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Jun 2012 00:28:20 +0000 (17:28 -0700)
commit4ea57bba378fd6e9deb4c1912535c49543d5fb0c
treec2bd20373bc709cc00288fd8fd21dbece8d5247d
parent89c285f232b1d7252d643001347fa0cc79e03cbd
parent4fa2e40226323db506ded4e61f1d5df6fc8c863f
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

Pull PowerPC fix from Paul Mackerras:
 "Just one commit, and a one-liner at that, but an important one;
  without it hard_irq_disable() does nothing on powerpc."

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  Make hard_irq_disable() actually hard-disable interrupts