tree 04d6191dcc1110074c48d569747e3ac94b595f45
parent 50851c6248e1a13c45d97c41f6ebcf716093aa5e
parent 3657600040a7279e52252af3f9d7e253f4f49ef0
author Linus Torvalds <torvalds@linux-foundation.org> 1355328913 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1355328913 -0800

Merge branch 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

Pull workqueue changes from Tejun Heo:
 "Nothing exciting.  Just two trivial changes."

* 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: add WARN_ON_ONCE() on CPU number to wq_worker_waking_up()
  workqueue: trivial fix for return statement in work_busy()