Merge branches 'irq-urgent-for-linus' and 'timers-urgent-for-linus' of git://git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Nov 2015 17:30:48 +0000 (09:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Nov 2015 17:30:48 +0000 (09:30 -0800)
Pull irq and timer fixes from Thomas Gleixner:

 - An irq regression fix to restore the wakeup behaviour of chained
   interrupts.

 - A timer fix for a long standing race versus timers scheduled on a
   target cpu which got exposed by recent changes in the workqueue
   implementation.

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  genirq/PM: Restore system wake up from chained interrupts

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timers: Use proper base migration in add_timer_on()

1  2  3 
kernel/irq/pm.c

diff --cc kernel/irq/pm.c
Simple merge