diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-02 19:58:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-02 19:58:14 -0800 |
| commit | 8a304e5dfb2bd5b75cb20cb6b420935665c97a40 (patch) | |
| tree | e8787dbd36f6388a974d900ffed4766d7965c937 /arch/x86/pci | |
| parent | c7b01d3dc297969e66b430830254d447d21bafc9 (diff) | |
| parent | e0780b720f75487911e0174ec3dec2da49f7bbfa (diff) | |
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
Diffstat (limited to 'arch/x86/pci')
0 files changed, 0 insertions, 0 deletions