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)
commit1043e3becfbae0bee618f9b4f9598b145c4774e1
treec2bd20373bc709cc00288fd8fd21dbece8d5247d
parent93dd048dbde493fb1eb11cdc844be5fa9cd1c925
parentf948501b36c6b3d9352ce212a197098a7e958971
Merge tag 'for-linus' of git://git./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