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)
commit8777c793d6a24c7f3adf52b1b1086e9706de4589
tree87817c46c895307df4f9188e7f13d1f18b0eb01e
parent7437e7d3672b6d23c08212c68752c9a9c25f8e9e
parent47dd5be2d6a82b8153e059a1d09eb3879d485bfd
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: flush_delayed_work: keep the original workqueue for re-queueing