diff options
| author | Ingo Molnar <[email protected]> | 2011-01-07 13:14:15 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2011-01-07 13:14:15 +0000 |
| commit | 1c2a48cf65580a276552151eb8f78d78c55b828e (patch) | |
| tree | 68ed0628a276b33cb5aa0ad4899c1afe0a33a69d /security/selinux/hooks.c | |
| parent | x86: apic: Cleanup and simplify setup_local_APIC() (diff) | |
| parent | Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | kernel-1c2a48cf65580a276552151eb8f78d78c55b828e.tar.gz kernel-1c2a48cf65580a276552151eb8f78d78c55b828e.zip | |
Merge branch 'linus' into x86/apic-cleanups
Conflicts:
arch/x86/include/asm/io_apic.h
Merge reason: Resolve the conflict, update to a more recent -rc base
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'security/selinux/hooks.c')
0 files changed, 0 insertions, 0 deletions