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: de18836 0221c81)

author	Ingo Molnar <mingo@elte.hu>
	Sun, 5 Apr 2009 23:41:22 +0000 (01:41 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Sun, 5 Apr 2009 23:41:22 +0000 (01:41 +0200)
commit	9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95
tree	7ff8833745d2f268f897f6fa4a27263b4a572245	tree \| snapshot
parent	de18836e447c2dc30120c0919b8db8ddc0401cc4	commit \| diff
parent	0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c	commit \| diff

Merge branch 'linus' into irq/threaded

Conflicts:
include/linux/irq.h
kernel/irq/handle.c

include/linux/hardirq.h	diff1 \|	diff2 \|	blob \| history
include/linux/interrupt.h	diff1 \|	diff2 \|	blob \| history
include/linux/irq.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/exit.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/handle.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/manage.c	diff1 \|	diff2 \|	blob \| history

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