original_kernel/arch
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
..
alpha
arm linker script: add missing .data.percpu.page_aligned 2009-01-17 15:26:32 +09:00
avr32
blackfin
cris
frv
h8300
ia64 Merge branch 'cpus4096' into core/percpu 2009-01-21 10:14:17 +01:00
m32r
m68k
m68knommu
mips Merge branch 'linus' into cpus4096 2009-01-15 15:45:31 +01:00
mn10300 irq: update all arches for new irq_desc, fix 2009-01-15 11:15:36 +01:00
parisc
powerpc linker script: add missing .data.percpu.page_aligned 2009-01-17 15:26:32 +09:00
s390
sh
sparc Merge branch 'linus' into cpus4096 2009-01-15 15:45:31 +01:00
um
x86 Merge branch 'cpus4096' into core/percpu 2009-01-21 10:14:17 +01:00
xtensa
.gitignore
Kconfig