pilppa.com Git - linux-2.6-omap-h63xx.git/commit

]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit

Merge commit 'v2.6.29-rc4' into core/percpu

Conflicts:
arch/x86/mach-voyager/voyager_smp.c
arch/x86/mm/fault.c

21 files changed:

arch/arm/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/blackfin/kernel/irqchip.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/irq_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/ia32/ia32entry.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/acpi/sleep.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/intel_cacheinfo.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irqinit_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mach-voyager/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mach-voyager/voyager_smp.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/fault.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/multicalls.h	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/efx.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/chip.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/numa_migrate.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

arch/arm/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/blackfin/kernel/irqchip.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/irq_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/ia32/ia32entry.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/acpi/sleep.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/intel_cacheinfo.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irqinit_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mach-voyager/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mach-voyager/voyager_smp.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/fault.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/multicalls.h	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/efx.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/chip.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/numa_migrate.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history