diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 10:14:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 10:14:17 +0100 |
| commit | 3eb3963fd1974c63e9bb3cfe774abc3e1995e479 (patch) | |
| tree | c00d6c2e8484793ab6bd0644db59bbdf5e9429c5 /drivers/pnp | |
| parent | Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/... (diff) | |
| parent | x86, cpumask: fix tlb flush race (diff) | |
| download | linux-3eb3963fd1974c63e9bb3cfe774abc3e1995e479.tar.xz linux-3eb3963fd1974c63e9bb3cfe774abc3e1995e479.zip | |
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>
Diffstat (limited to 'drivers/pnp')
0 files changed, 0 insertions, 0 deletions