diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-25 18:07:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-25 18:07:01 -0800 |
| commit | 4d2f0ef1c9f78c99dc82baeee3996c4a0c914aac (patch) | |
| tree | e5b593e1340bdf7b66e9a9d1d2c69827c473125b /drivers/watchdog/Makefile | |
| parent | b73f0c8f4ba810cd753031d18f4fab83bd9ac58f (diff) | |
| parent | 2f5eaf66e580f64032b365a00157b6b58c266b37 (diff) | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner:
"From the irqchip departement you get:
- regression fix for omap-intc
- regression fix for atmel-aic-common
- functional correctness fix for hip04
- type mismatch fix for gic-v3-its
- proper error pointer check for mtd-sysirq
Mostly one and two liners except for the omap regression fix which is
slightly larger than desired"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip: atmel-aic-common: Prevent clobbering of priority when changing IRQ type
irqchip: omap-intc: Fix legacy DMA regression
irqchip: gic-v3-its: Fix use of max with decimal constant
irqchip: hip04: Initialize hip04_cpu_map to 0xffff
irqchip: mtk-sysirq: Use IS_ERR() instead of NULL pointer check
Diffstat (limited to 'drivers/watchdog/Makefile')
0 files changed, 0 insertions, 0 deletions