From: Linus Torvalds Date: Thu, 3 Mar 2011 03:58:14 +0000 (-0800) Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8a304e5dfb2bd5b75cb20cb6b420935665c97a40;p=linux-beck.git 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 --- 8a304e5dfb2bd5b75cb20cb6b420935665c97a40