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)
Conflicts:
include/linux/irq.h
kernel/irq/handle.c


Trivial merge