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

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2011-03-02 19:58:14 -08:00

parent c7b01d3dc2 e0780b720f

commit 8a304e5dfb

4 changed files with 18 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

arch/powerpc/include/asm/machdep.h

View file

5

arch/powerpc/kernel/machine_kexec.c

View file

8

arch/powerpc/kernel/process.c

View file

6

arch/powerpc/mm/tlb_hash64.c

View file