commit 6ccf09bbd22ed02596e790a52a741c07a945a9ef
author Linus Torvalds <torvalds@linux-foundation.org> Fri Mar 12 16:06:51 2010 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Mar 12 16:06:51 2010 -0800
tree 8670ff761ea84c4f59d0e0ce7dc2fb826c1a831b
parent 5a7e3556f05cc8a1977cfd7e3862b87369eedb6e
parent 5e6bf0d228c674a3fbc3745d3d429c3638ff3769

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

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/booke: Fix breakpoint/watchpoint one-shot behavior
  powerpc: Reduce printk from pseries_mach_cpu_die()
  powerpc: Move checks in pseries_mach_cpu_die()
  powerpc: Reset kernel stack on cpu online from cede state
  powerpc: Fix G5 thermal shutdown
  powerpc/pseries: Pass CPPR value to H_XIRR hcall
  powerpc/booke: Fix a couple typos in the advanced ptrace code
  powerpc: Fix SMP build with disabled CPU hotplugging.
  powerpc: Dynamically allocate pacas
  powerpc/perf: e500 support
  powerpc/perf: Build callchain code regardless of hardware event support.
  powerpc/cpm2: Checkpatch cleanup
  powerpc/86xx: Renaming following split of GE Fanuc joint venture
  powerpc/86xx: Convert gef_pic_lock to raw_spinlock
  powerpc/qe: Convert qe_ic_lock to raw_spinlock
  powerpc/82xx: Convert pci_pic_lock to raw_spinlock
  powerpc/85xx: Convert socrates_fpga_pic_lock to raw_spinlock

[ upstream commit: b6fedfd2a18a489d31246312f7279f82e3cc6b37 ]