Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 May 2010 16:03:02 +0000 (09:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 May 2010 16:03:02 +0000 (09:03 -0700)
commitfa5312d9e87e7222c6c384c4e930dc149bc1178d
tree3a181e52c7ae863de566a6b30248a175742a8406
parent9c688c114c4665ac8c6da05b2f6b987f4adc6dae
parent4d707b9f48e2c4aa94b96f1133813b73df71fb55
Merge branch 'for-linus' of git://git./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()