From: Linus Torvalds Date: Wed, 5 May 2010 14:56:36 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8777c793d6a24c7f3adf52b1b1086e9706de4589;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.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: flush_delayed_work: keep the original workqueue for re-queueing --- 8777c793d6a24c7f3adf52b1b1086e9706de4589