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


Trivial merge