From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 26 Nov 2012 01:57:01 +0000 (-0800)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: v3.7-rc7~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08e627b5cee12ca63de60aae2cc30af2028f6159;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

08e627b5cee12ca63de60aae2cc30af2028f6159