From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 May 2010 16:03:02 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
X-Git-Tag: v2.6.35-rc1~485
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=fa5312d9e87e7222c6c384c4e930dc149bc1178d;p=linux-2.6-block.git

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()
---

fa5312d9e87e7222c6c384c4e930dc149bc1178d