kernel-fxtec-pro1x/arch/x86
Ingo Molnar 3eb3963fd1 Merge branch 'cpus4096' into core/percpu
Conflicts:
	arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
	arch/x86/kernel/tlb_32.c

Merge it here because both the cpumask changes and the ongoing percpu
work is touching the TLB code. The percpu changes take precedence, as
they eliminate tlb_32.c altogether.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-01-21 10:14:17 +01:00
..
boot
configs
crypto
ia32
include/asm Merge branch 'cpus4096' into core/percpu 2009-01-21 10:14:17 +01:00
kernel Merge branch 'cpus4096' into core/percpu 2009-01-21 10:14:17 +01:00
kvm
lguest
lib
mach-default
mach-generic
mach-rdc321x
mach-voyager
math-emu
mm
oprofile
pci
power
scripts
vdso
video
xen x86: remove pda_init() 2009-01-20 12:29:19 +09:00
Kconfig
Kconfig.cpu
Kconfig.debug
Makefile
Makefile_32.cpu