]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Feb 2017 18:14:24 +0000 (10:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Feb 2017 18:14:24 +0000 (10:14 -0800)
Pull irq fixes from Ingo Molnar:
 "Two last minute ARM irqchip driver fixes"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND
  irqchip/keystone: Fix "scheduling while atomic" on rt


Trivial merge