tree dc27644add7d5f1165db19c28c25ae842e5f96b2
parent 8209f53d79444747782a28520187abaf689761f2
parent 9c5a2ba70251ecaab18c7a83e38b3c620223476c
author Linus Torvalds <torvalds@linux-foundation.org> 1311372435 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1311372435 -0700

Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/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]()