tree 230e2f91e91c58dc1f7b7487cfd417929b78ae6b
parent 4b483802fddf74d8dae5970d7fcd55525c7cfa17
parent ea461abf61753b4b79e625a7c20650105b990f21
author Linus Torvalds <torvalds@linux-foundation.org> 1372630095 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1372630095 -0700

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