From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 May 2012 23:58:14 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ec53646fc74efaf5d26c5e706bb99c7c5fd8d9c1;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'merge' of git://git./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
---

ec53646fc74efaf5d26c5e706bb99c7c5fd8d9c1