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: 7be7585 8299608)

author	Rusty Russell <rusty@rustcorp.com.au>
	Sat, 13 Dec 2008 11:25:51 +0000 (21:55 +1030)
committer	Rusty Russell <rusty@rustcorp.com.au>
	Sat, 13 Dec 2008 11:25:51 +0000 (21:55 +1030)
commit	968ea6d80e395cf11a51143cfa1b9a14ada676df
tree	dc2acec8c9bdced33afe1e273ee5e0b0b93d2703	tree \| snapshot
parent	7be7585393d311866653564fbcd10a3232773c0b	commit \| diff
parent	8299608f140ae321e4eb5d1306184265d2b9511e	commit \| diff

Merge ../linux-2.6-x86

Conflicts:

arch/x86/kernel/io_apic.c
kernel/sched.c
kernel/sched_stats.h

15 files changed:

arch/m32r/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irq_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irq_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
drivers/xen/events.c	diff1 \|	diff2 \|	blob \| history
include/linux/interrupt.h	diff1 \|	diff2 \|	blob \| history
include/linux/irq.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/irq/chip.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/proc.c	diff1 \|	diff2 \|	blob \| history
kernel/profile.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sched_stats.h	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history

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