| commit | fa5312d9e87e7222c6c384c4e930dc149bc1178d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 20 09:03:02 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 20 09:03:02 2010 -0700 |
| tree | 3a181e52c7ae863de566a6b30248a175742a8406 | |
| parent | 9c688c114c4665ac8c6da05b2f6b987f4adc6dae [diff] | |
| parent | 4d707b9f48e2c4aa94b96f1133813b73df71fb55 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: change cancel_work_sync() to clear work->data workqueue: warn about flush_scheduled_work()