diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-16 09:45:33 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-16 09:45:47 +0100 |
| commit | 275a88d3cf0e2f08a98dc5ce9494af0cb6ed2092 (patch) | |
| tree | 785ce29ec09904fbde73c63e3aeadaf6537752a5 /security/selinux/hooks.c | |
| parent | 52b8b8d7251f8f7b8ed4a6c623618106d83e18b5 (diff) | |
| parent | 9e81509efc4fefcdd75cc6a4121672fa71ae8745 (diff) | |
Merge branch 'x86/amd-nb' into x86/mm
Merge reason: consolidate it into the more generic x86/mm tree to prevent conflicts
with ongoing NUMA work.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'security/selinux/hooks.c')
0 files changed, 0 insertions, 0 deletions