Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Mar 2011 03:58:14 +0000 (19:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Mar 2011 03:58:14 +0000 (19:58 -0800)
commit8a304e5dfb2bd5b75cb20cb6b420935665c97a40
treee8787dbd36f6388a974d900ffed4766d7965c937
parentc7b01d3dc297969e66b430830254d447d21bafc9
parente0780b720f75487911e0174ec3dec2da49f7bbfa
Merge branch 'merge' of git://git./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