aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-02-15 16:06:12 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-02-15 16:06:12 -0800
commit5a667a0c02f3d24eb82a44074d24524c17e1ad34 (patch)
tree8f2db0e40abd8bc8dbb79e21f831c0734a87fa6d /kernel
parent3a19c07c565c1e05b73b165c3dc0750d6863a81c (diff)
parent2c45aada341121438affc4cb8d5b4cfaa2813d3d (diff)
parent0668d3065128d39449c097e62dbdb5707820137d (diff)
downloadlinux-5a667a0c02f3d24eb82a44074d24524c17e1ad34.tar.gz
Merge branches 'irq-urgent-for-linus' and 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq update from Thomas Gleixner: "Fix from the urgent branch: a trivial oneliner adding the missing Kconfig dependency curing build failures which have been discovered by several build robots. The update in the irq-core branch provides a new function in the irq/devres code, which is a prerequisite for driver developers to get rid of boilerplate code all over the place. Not a bugfix, but it has zero impact on the current kernel due to the lack of users. It's simpler to provide the infrastructure to interested parties via your tree than fulfilling the wishlist of driver maintainers on which particular commit or tag this should be based on" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: genirq: Add missing irq_to_desc export for CONFIG_SPARSE_IRQ=n * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: genirq: Add devm_request_any_context_irq()