tree 47fdb196fc109411d4524bf2c25d88a6d5470477
parent 8b36ac50da8e12d0469a7268ddbd6cab29307deb
parent 778a785f02ad846446e91dab49331bd7d853c514
author Linus Torvalds <torvalds@linux-foundation.org> 1329261685 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1329261685 -0800

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

Quoth BenH:
 "Here are a few powerpc fixes for 3.3, all pretty trivial.  I also
  added the patch to define GET_IP/SET_IP so we can use some more
  asm-generic goodness."

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/pseries/eeh: Fix crash when error happens during device probe
  powerpc/pseries: Fix partition migration hang in stop_topology_update
  powerpc/powernv: Disable interrupts while taking phb->lock
  powerpc: Fix WARN_ON in decrementer_check_overflow
  powerpc/wsp: Fix IRQ affinity setting
  powerpc: Implement GET_IP/SET_IP
  powerpc/wsp: Permanently enable PCI class code workaround