tree d7e02fb4ee5dd27a97dadd39a52b105b3770aa02
parent 04e53358ec23b836af5c5718d1c368ba23abc2c2
parent 7c0482e3d055e5de056d3c693b821e39205b99ae
author Linus Torvalds <torvalds@linux-foundation.org> 1336780694 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1336780694 -0700

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

Pull another powerpc irq fix from Benjamin Herrenschmidt:
 "It looks like my previous fix for the lazy irq masking problem wasn't
  quite enough.  There was another problem related to performance
  monitor interrupts acting as NMIs leaving the flags in an incorrect
  state.  Here's a fix that finally seems to make perf solid again."

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/irq: Fix another case of lazy IRQ state getting out of sync