projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ae2b56b 5766b84)
Merge branch 'cpus4096' into core/percpu
authorIngo Molnar <mingo@elte.hu>
Wed, 21 Jan 2009 09:14:17 +0000 (10:14 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 21 Jan 2009 09:14:17 +0000 (10:14 +0100)
commit3eb3963fd1974c63e9bb3cfe774abc3e1995e479
treec00d6c2e8484793ab6bd0644db59bbdf5e9429c5tree | snapshot
parentae2b56b92bd33b416528986528e0732c98c7a285commit | diff
parent5766b842b23c6b40935a5f3bd435b2bcdaff2143commit | diff
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>
arch/x86/include/asm/topology.h diff1 | diff2 | blob | history
arch/x86/kernel/apic.c diff1 | diff2 | blob | history
John Crispins staging tree