tree e8787dbd36f6388a974d900ffed4766d7965c937
parent c7b01d3dc297969e66b430830254d447d21bafc9
parent e0780b720f75487911e0174ec3dec2da49f7bbfa
author Linus Torvalds <torvalds@linux-foundation.org> 1299124694 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1299124694 -0800

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: Fix call to flush_ptrace_hw_breakpoint()
  powerpc/kexec: Restore ppc_md.machine_kexec
  powerpc/mm: Make hpte_need_flush() safe for preemption