]> www.infradead.org Git - users/willy/linux.git/commitdiff
projects / users / willy / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12a4996 4dbc9ca)
Merge branch 'irq-threaded-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Sep 2009 20:21:31 +0000 (13:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Sep 2009 20:21:31 +0000 (13:21 -0700)
* 'irq-threaded-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: Do not mask oneshot edge type interrupts
  genirq: Support nested threaded irq handling
  genirq: Add buslock support
  genirq: Add oneshot support

1  2 
include/linux/irq.h patch | diff1 | diff2 | blob | history
kernel/irq/manage.c patch | diff1 | diff2 | blob | history

diff --cc include/linux/irq.h
Simple merge
diff --cc kernel/irq/manage.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.