summaryrefslogtreecommitdiffstats
path: root/arch/x86/boot
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-20 17:40:50 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-20 17:40:50 +0100
commit609162850db11dfe3b23f43b36888aa8b3ad7685 (patch)
tree75d6c6415232da445050134c836b6d9bb967c899 /arch/x86/boot
parent3b6f7b9beb553ea71a6d4d76ba82cf32eb6dadd2 (diff)
parentcb425afd2183e90a481bb211ff49361a117a3ecc (diff)
parentecab22aa6dc9d42ca52de2cad0854b4c6bd85ac9 (diff)
parente9ce0c37c2cb203a4fa6a350108199da0cad5a17 (diff)
downloadlinux-609162850db11dfe3b23f43b36888aa8b3ad7685.tar.bz2
Merge branches 'x86/asm', 'x86/cleanups' and 'x86/headers' into x86/core