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

projects / openwrt / staging / blogic.git / commit

author	Ingo Molnar <mingo@elte.hu>
	Mon, 6 Apr 2009 07:02:57 +0000 (09:02 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 6 Apr 2009 07:02:57 +0000 (09:02 +0200)
commit	f541ae326fa120fa5c57433e4d9a133df212ce41
tree	bdbd94ec72cfc601118051cb35e8617d55510177	tree \| snapshot
parent	e255357764f92afcafafbd4879b222b8c752065a	commit \| diff
parent	0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c	commit \| diff

Merge branch 'linus' into perfcounters/core-v2

Merge reason: we have gathered quite a few conflicts, need to merge upstream

Conflicts:
arch/powerpc/kernel/Makefile
arch/x86/ia32/ia32entry.S
arch/x86/include/asm/hardirq.h
arch/x86/include/asm/unistd_32.h
arch/x86/include/asm/unistd_64.h
arch/x86/kernel/cpu/common.c
arch/x86/kernel/irq.c
arch/x86/kernel/syscall_table_32.S
arch/x86/mm/iomap_32.c
include/linux/sched.h
kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>

38 files changed:

arch/powerpc/include/asm/hw_irq.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/systbl.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/asm-offsets.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/Kconfig.cputype	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/ia32/ia32entry.S	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/hardirq.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/hw_irq.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/unistd_32.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/unistd_64.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/amd.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irqinit_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irqinit_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/syscall_table_32.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/processor_idle.c	diff1 \|	diff2 \|	blob \| history
drivers/char/sysrq.c	diff1 \|	diff2 \|	blob \| history
fs/exec.c	diff1 \|	diff2 \|	blob \| history
include/linux/init_task.h	diff1 \|	diff2 \|	blob \| history
include/linux/kernel_stat.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
include/linux/syscalls.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/exit.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sys.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

arch/powerpc/include/asm/hw_irq.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/systbl.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/asm-offsets.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/Kconfig.cputype	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/ia32/ia32entry.S	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/hardirq.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/hw_irq.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/unistd_32.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/unistd_64.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/amd.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irqinit_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irqinit_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/syscall_table_32.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/processor_idle.c	diff1 \|	diff2 \|	blob \| history
drivers/char/sysrq.c	diff1 \|	diff2 \|	blob \| history
fs/exec.c	diff1 \|	diff2 \|	blob \| history
include/linux/init_task.h	diff1 \|	diff2 \|	blob \| history
include/linux/kernel_stat.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
include/linux/syscalls.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/exit.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sys.c	diff1 \|	diff2 \|	blob \| history