Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
commit08e627b5cee12ca63de60aae2cc30af2028f6159
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Nov 2012 01:57:01 +0000 (25 17:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Nov 2012 01:57:01 +0000 (25 17:57 -0800)
treedbd9f9c5b56da52c2db287a3c34808125846e0d0
parentc2a65d3d85a08b6c93da7b8664c89d1cd0682adf
parente716e014384688d1a50d1aa5213ee74748c6d4e0
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

Pull powerpc EEH bugfixes from Benjamin Herrenschmidt.

Two one-liner fixes for the new EEH code.

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/eeh: Do not invalidate PE properly
  powerpc/pseries: Fix oops with MSIs when missing EEH PEs