Merge branch 'for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 May 2017 20:49:27 +0000 (13:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 May 2017 20:49:27 +0000 (13:49 -0700)
commitad1490bcd2484a24f5b8d7ae18368b739f3e1e19
tree4248956ddc4621800980dd42ef2d2ca051d38ed0
parente69bbe75de8ee0e732b8c009197f1a97e804d43c
parentc30fb26b116e4735597c46ff80cddb582c3c2727
Merge branch 'for-4.12' of git://git./linux/kernel/git/tj/wq

Pull workqueue update from Tejun Heo:
 "One trivial patch to use setup_deferrable_timer() instead of
  open-coding the initialization"

* 'for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: use setup_deferrable_timer
kernel/workqueue.c