tree 2b45df88a77cca6eaeac414653a852c3905dd514
parent 96d4e231d25e3d7d8b7a2a9267043eac5d4560a8
parent 546d30c4a2e61a53d408e5f40d01278f144bb0f5
author Linus Torvalds <torvalds@linux-foundation.org> 1378257561 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1378257561 -0700

Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/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