]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Feb 2012 15:54:57 +0000 (07:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Feb 2012 15:54:57 +0000 (07:54 -0800)
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  genirq: Handle pending irqs in irq_startup()
  genirq: Unmask oneshot irqs when thread was not woken


Trivial merge