summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-17 12:21:12 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-17 12:21:12 +0100
commit9f361c221912b6ffa1f7836e0bbf843917f6fce7 (patch)
tree743d3a925490d9f99eead314ac152c79cfe6c5a2 /init
parentMerge branches 'x86/acpi', 'x86/apic', 'x86/cpudetect', 'x86/headers', 'x86/p... (diff)
parentx86: remove stale arch/x86/include/asm/page_64.h.rej file (diff)
downloadlinux-9f361c221912b6ffa1f7836e0bbf843917f6fce7.tar.xz
linux-9f361c221912b6ffa1f7836e0bbf843917f6fce7.zip
Merge branch 'x86/headers' into x86/core
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions