tree 930825162814ee91e8fa52a871d9b80c5951d6da
parent 0b52a3c89c8f44d7a936da8b374789dc0f43b188
parent b11ae95100f7061b39a15e5c1ecbf862464ac4b4
author Linus Torvalds <torvalds@linux-foundation.org> 1370826105 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1370826105 -0700

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

Pull powerpc fixes from Benjamin Herrenschmidt:
 "This is purely regressions (though not all recent ones) or stable
  material"

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Partial revert of "Context switch more PMU related SPRs"
  powerpc/perf: Fix deadlock caused by calling printk() in PMU exception
  powerpc/hw_breakpoints: Add DABRX cpu feature to fix 32-bit regression
  powerpc/power8: Update denormalization handler
  powerpc/pseries: Simplify denormalization handler
  powerpc/power8: Fix oprofile and perf
  powerpc/eeh: Don't check RTAS token to get PE addr
  powerpc/pci: Check the bus address instead of resource address in pcibios_fixup_resources