summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-h720x/system.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-25 11:37:07 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-25 11:37:07 +0200
commit0e2f65ee30eee2db054f7fd73f462c5da33ec963 (patch)
tree26c61eb7745da0c0d9135e9d12088f570cb8530d /include/asm-arm/arch-h720x/system.h
parentMerge branch 'linus' into x86/pebs (diff)
parentfix fs/nfs/nfsroot.c compilation (diff)
downloadlinux-0e2f65ee30eee2db054f7fd73f462c5da33ec963.tar.xz
linux-0e2f65ee30eee2db054f7fd73f462c5da33ec963.zip
Merge branch 'linus' into x86/pebs
Conflicts: arch/x86/Kconfig.cpu arch/x86/kernel/cpu/intel.c arch/x86/kernel/setup_64.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-arm/arch-h720x/system.h')
0 files changed, 0 insertions, 0 deletions