| commit | 6e15cf04860074ad032e88c306bea656bbdd0f22 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Thu Mar 26 21:39:17 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Mar 27 17:28:43 2009 +0100 |
| tree | c346383bb7563e8d66b2f4a502f875b259c34870 | |
| parent | be0ea69674ed95e1e98cb3687a241badc756d228 [diff] | |
| parent | 60db56422043aaa455ac7f858ce23c273220f9d9 [diff] |
Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2
Conflicts:
arch/parisc/kernel/irq.c
arch/x86/include/asm/fixmap_64.h
arch/x86/include/asm/setup.h
kernel/irq/handle.c
Semantic merge:
arch/x86/include/asm/fixmap.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>