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

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

projects / linux-2.6-omap-h63xx.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ba1511b 071a0bc)

author	Ingo Molnar <mingo@elte.hu>
	Fri, 13 Feb 2009 08:44:22 +0000 (09:44 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 13 Feb 2009 08:44:22 +0000 (09:44 +0100)
commit	f8a6b2b9cee298a9663cbe38ce1eb5240987cb62
tree	b356490269c9e77d164dcc1477792b882fbb8bdb	tree \| snapshot
parent	ba1511bf7fbda452138e4096bf10d5a382710f4f	commit \| diff
parent	071a0bc2ceace31266836801510879407a3701fa	commit \| diff

Merge branch 'linus' into x86/apic

Conflicts:
arch/x86/kernel/acpi/boot.c
arch/x86/mm/fault.c

18 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/include/asm/paravirt.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/spinlock.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/acpi/sleep.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/intel.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vmi_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/fault.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	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

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