diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-01 11:33:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-01 11:33:04 -0800 |
| commit | 4bf690d7e09bbac43dfac9af01ba263e08f37e3e (patch) | |
| tree | dfdf89cefc6ab3689eeba54bd2dd5ec0e2dbc79c /mm/swap_state.c | |
| parent | 56ef9db24633cf6528d2ce736de0985eb125a3c1 (diff) | |
| parent | 209da39154837ec1b69fb34f438041939911e4b4 (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:
"The last two one-liners for 4.3 from the irqchip space:
- Regression fix for armada SoC which addresses the fallout from the
set_irq_flags() cleanup
- Add the missing propagation of the irq_set_type() callback to the
parent interrupt controller of the tegra interrupt chip"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip/tegra: Propagate IRQ type setting to parent
irqchip/armada-370-xp: Fix regression by clearing IRQ_NOAUTOEN
Diffstat (limited to 'mm/swap_state.c')
0 files changed, 0 insertions, 0 deletions