diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-27 12:03:24 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-27 12:03:24 +0100 |
| commit | 4369f1fb7cd4cf777312f43e1cb9aa5504fc4125 (patch) | |
| tree | a5525d63fe682e6744c109fb72f7e1b33855cb00 /include/asm-mn10300/pio-regs.h | |
| parent | Merge branch 'linus' into core/percpu (diff) | |
| parent | x86: clean up indentation in setup_per_cpu_areas() (diff) | |
| download | linux-4369f1fb7cd4cf777312f43e1cb9aa5504fc4125.tar.xz linux-4369f1fb7cd4cf777312f43e1cb9aa5504fc4125.zip | |
Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu
Conflicts:
arch/x86/kernel/setup_percpu.c
Semantic conflict:
arch/x86/kernel/cpu/common.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-mn10300/pio-regs.h')
0 files changed, 0 insertions, 0 deletions