| /openbmc/linux/include/linux/ |
| H A D | irqnr.h | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|
| H A D | interrupt.h | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|
| H A D | irq.h | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|
| /openbmc/linux/arch/sparc/kernel/ |
| H A D | time_64.c | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|
| H A D | irq_64.c | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|
| /openbmc/linux/arch/ia64/kernel/ |
| H A D | msi_ia64.c | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|
| H A D | irq.c | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|
| /openbmc/linux/arch/alpha/kernel/ |
| H A D | irq.c | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|
| /openbmc/linux/arch/arm/kernel/ |
| H A D | irq.c | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|
| /openbmc/linux/kernel/irq/ |
| H A D | internals.h | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|
| H A D | handle.c | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|
| H A D | chip.c | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|
| /openbmc/linux/arch/x86/kernel/ |
| H A D | reboot.c | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|
| H A D | tsc.c | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|
| H A D | setup.c | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|
| /openbmc/linux/arch/powerpc/kernel/ |
| H A D | irq.c | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|
| /openbmc/linux/arch/x86/kernel/cpu/ |
| H A D | intel.c | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|
| /openbmc/linux/kernel/ |
| H A D | softirq.c | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|
| /openbmc/linux/drivers/acpi/ |
| H A D | osl.c | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|
| /openbmc/linux/lib/ |
| H A D | Makefile | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|
| /openbmc/linux/net/ipv4/ |
| H A D | af_inet.c | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|
| /openbmc/linux/init/ |
| H A D | main.c | 6e15cf04 Thu Mar 26 15:39:17 CDT 2009 Ingo Molnar <mingo@elte.hu> 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>
|