]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bfb942e 9838a21)
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)
commit7d211480458542511acaced85064440b5b7a210a
treec00d6c2e8484793ab6bd0644db59bbdf5e9429c5tree | snapshot
parentbfb942e4ed08fcd9ccb73e8aa56c94770eed1e4dcommit | diff
parent9838a216456449060f1d6ccc9300c084dbfa2b25commit | 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
Linux Kernel Source Tree.