tree afe3d4aa24849c561bb1e6c04c4c54808cbedb47
parent 12a499612e1ff439bdad240c7f86c55366941d4d
parent 4dbc9ca219b0f294332e734528f7b82211700170
author Linus Torvalds <torvalds@linux-foundation.org> 1252700491 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1252700491 -0700

Merge branch 'irq-threaded-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* '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