Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 May 2010 14:56:36 +0000 (07:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 May 2010 14:56:36 +0000 (07:56 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: flush_delayed_work: keep the original workqueue for re-queueing


Trivial merge