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)
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

1  2 
kernel/workqueue.c

Simple merge