diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-03 04:58:14 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-03 04:58:14 +0100 |
| commit | 8a304e5dfb2bd5b75cb20cb6b420935665c97a40 (patch) | |
| tree | e8787dbd36f6388a974d900ffed4766d7965c937 /security/apparmor | |
| parent | Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | powerpc: Fix call to flush_ptrace_hw_breakpoint() (diff) | |
| download | linux-8a304e5dfb2bd5b75cb20cb6b420935665c97a40.tar.xz linux-8a304e5dfb2bd5b75cb20cb6b420935665c97a40.zip | |
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 'security/apparmor')
0 files changed, 0 insertions, 0 deletions