tree dbd9f9c5b56da52c2db287a3c34808125846e0d0
parent c2a65d3d85a08b6c93da7b8664c89d1cd0682adf
parent e716e014384688d1a50d1aa5213ee74748c6d4e0
author Linus Torvalds <torvalds@linux-foundation.org> 1353895021 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1353895021 -0800

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