git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	Ingo Molnar <mingo@elte.hu>
	Thu, 26 Mar 2009 20:39:17 +0000 (21:39 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 27 Mar 2009 16:28:43 +0000 (17:28 +0100)
commit	6e15cf04860074ad032e88c306bea656bbdd0f22
tree	c346383bb7563e8d66b2f4a502f875b259c34870	tree \| snapshot
parent	be0ea69674ed95e1e98cb3687a241badc756d228	commit \| diff
parent	60db56422043aaa455ac7f858ce23c273220f9d9	commit \| 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>

49 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/alpha/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/blackfin/kernel/irqchip.c	diff1 \|	diff2 \|	blob \| history
arch/ia64/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/ia64/kernel/msi_ia64.c	diff1 \|	diff2 \|	blob \| history
arch/parisc/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/irq_64.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/time_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/fixmap.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/cpufreq/e_powersaver.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/intel.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/efi.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/efi_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/reboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/tsc.c	diff1 \|	diff2 \|	blob \| history
arch/x86/lguest/boot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pageattr.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/osl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/efx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/falcon.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/intr_remapping.c	diff1 \|	diff2 \|	blob \| history
include/asm-generic/vmlinux.lds.h	diff1 \|	diff2 \|	blob \| history
include/linux/interrupt.h	diff1 \|	diff2 \|	blob \| history
include/linux/irq.h	diff1 \|	diff2 \|	blob \| history
include/linux/irqnr.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/chip.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/handle.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/internals.h	diff1 \|	diff2 \|	blob \| history
kernel/irq/manage.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/numa_migrate.c	diff1 \|	diff2 \|	blob \| history
kernel/module.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sched_rt.c	diff1 \|	diff2 \|	blob \| history
kernel/softirq.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig	diff1 \|	diff2 \|	blob \| history
lib/Makefile	diff1 \|	diff2 \|	blob \| history
net/ipv4/af_inet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
scripts/Makefile.lib	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/alpha/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/blackfin/kernel/irqchip.c	diff1 \|	diff2 \|	blob \| history
arch/ia64/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/ia64/kernel/msi_ia64.c	diff1 \|	diff2 \|	blob \| history
arch/parisc/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/irq_64.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/time_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/fixmap.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/cpufreq/e_powersaver.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/intel.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/efi.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/efi_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/reboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/tsc.c	diff1 \|	diff2 \|	blob \| history
arch/x86/lguest/boot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pageattr.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/osl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/efx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/falcon.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/intr_remapping.c	diff1 \|	diff2 \|	blob \| history
include/asm-generic/vmlinux.lds.h	diff1 \|	diff2 \|	blob \| history
include/linux/interrupt.h	diff1 \|	diff2 \|	blob \| history
include/linux/irq.h	diff1 \|	diff2 \|	blob \| history
include/linux/irqnr.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/chip.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/handle.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/internals.h	diff1 \|	diff2 \|	blob \| history
kernel/irq/manage.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/numa_migrate.c	diff1 \|	diff2 \|	blob \| history
kernel/module.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sched_rt.c	diff1 \|	diff2 \|	blob \| history
kernel/softirq.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig	diff1 \|	diff2 \|	blob \| history
lib/Makefile	diff1 \|	diff2 \|	blob \| history
net/ipv4/af_inet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
scripts/Makefile.lib	diff1 \|	diff2 \|	blob \| history