diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-12 16:15:13 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-12 16:15:13 (GMT) |
| commit | e7b55b8fcd3a32ba1f95ccd95fb9a11ccfa63563 (patch) | |
| tree | 04d6191dcc1110074c48d569747e3ac94b595f45 /kernel/trace | |
| parent | 50851c6248e1a13c45d97c41f6ebcf716093aa5e (diff) | |
| parent | 3657600040a7279e52252af3f9d7e253f4f49ef0 (diff) | |
| download | linux-fsl-qoriq-e7b55b8fcd3a32ba1f95ccd95fb9a11ccfa63563.tar.xz | |
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()
Diffstat (limited to 'kernel/trace')
0 files changed, 0 insertions, 0 deletions