diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-25 17:57:01 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-25 17:57:01 -0800 |
commit | 08e627b5cee12ca63de60aae2cc30af2028f6159 (patch) | |
tree | dbd9f9c5b56da52c2db287a3c34808125846e0d0 /arch/sparc/kernel/leon_kernel.c | |
parent | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus (diff) | |
parent | powerpc/eeh: Do not invalidate PE properly (diff) | |
download | linux-dev-08e627b5cee12ca63de60aae2cc30af2028f6159.tar.xz linux-dev-08e627b5cee12ca63de60aae2cc30af2028f6159.zip |
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
Diffstat (limited to 'arch/sparc/kernel/leon_kernel.c')
0 files changed, 0 insertions, 0 deletions