summaryrefslogtreecommitdiff
path: root/arch/um
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-01 02:08:15 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-01 02:08:15 +0400
commitf0277dce1b5e8200bb7914472ffdb40a10b6f0ce (patch)
tree230e2f91e91c58dc1f7b7487cfd417929b78ae6b /arch/um
parent4b483802fddf74d8dae5970d7fcd55525c7cfa17 (diff)
parentea461abf61753b4b79e625a7c20650105b990f21 (diff)
downloadlinux-f0277dce1b5e8200bb7914472ffdb40a10b6f0ce.tar.xz
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull another powerpc fix from Benjamin Herrenschmidt: "I mentioned that while we had fixed the kernel crashes, EEH error recovery didn't always recover... It appears that I had a fix for that already in powerpc-next (with a stable CC). I cherry-picked it today and did a few tests and it seems that things now work quite well. The patch is also pretty simple, so I see no reason to wait before merging it." * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/eeh: Fix fetching bus for single-dev-PE
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions