summaryrefslogtreecommitdiffstats
path: root/arch/x86/mach-default
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-14 14:58:22 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-14 14:58:22 +0200
commitc83d12806b6185131ece682de8696d8cfb78df69 (patch)
tree6eb639a6746b0e3c2aa1e57f3a9ee5eea6dfc793 /arch/x86/mach-default
parentMerge branch 'linus' into x86/core (diff)
parentMerge commit 'v2.6.27-rc3' into x86/prototypes (diff)
parentMerge branch 'linus' into x86/x2apic (diff)
parentx86: print per_cpu data address (diff)
downloadlinux-c83d12806b6185131ece682de8696d8cfb78df69.tar.xz
linux-c83d12806b6185131ece682de8696d8cfb78df69.zip
Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core