Merge branch 'linus' into irq/threaded
authorIngo Molnar <mingo@elte.hu>
Sun, 5 Apr 2009 23:41:22 +0000 (01:41 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 5 Apr 2009 23:41:22 +0000 (01:41 +0200)
commit9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95
tree7ff8833745d2f268f897f6fa4a27263b4a572245
parentde18836e447c2dc30120c0919b8db8ddc0401cc4
parent0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c
Merge branch 'linus' into irq/threaded

Conflicts:
include/linux/irq.h
kernel/irq/handle.c
include/linux/hardirq.h
include/linux/interrupt.h
include/linux/irq.h
include/linux/sched.h
kernel/exit.c
kernel/irq/handle.c
kernel/irq/manage.c