From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Jul 2011 22:07:15 +0000 (-0700)
Subject: Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=5a791ea4fa4495f7136679cb5366f6544148e613;p=linux-edison.git

Merge branch 'for-3.1' of git://git./linux/kernel/git/tj/wq

* 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: separate out drain_workqueue() from destroy_workqueue()
  workqueue: remove cancel_rearming_delayed_work[queue]()
---

5a791ea4fa4495f7136679cb5366f6544148e613