Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Sep 2013 01:19:21 +0000 (18:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Sep 2013 01:19:21 +0000 (18:19 -0700)
commit9ee52a1633a77961cb7b7fb5bd40be682f8412c7
tree2b45df88a77cca6eaeac414653a852c3905dd514
parent96d4e231d25e3d7d8b7a2a9267043eac5d4560a8
parent546d30c4a2e61a53d408e5f40d01278f144bb0f5
Merge branch 'for-3.12' of git://git./linux/kernel/git/tj/wq

Pull workqueue updates from Tejun Heo:
 "Nothing interesting.  All are doc / comment updates"

* 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: Correct/Drop references to gcwq in Documentation
  workqueue: Fix manage_workers() RETURNS description
  workqueue: Comment correction in file header
  workqueue: mark WQ_NON_REENTRANT deprecated
kernel/workqueue.c