Merge branch 'sched-wq' of ../wq into cmwq-base
authorTejun Heo <tj@kernel.org>
Sun, 13 Jun 2010 16:19:48 +0000 (18:19 +0200)
committerTejun Heo <tj@kernel.org>
Sun, 13 Jun 2010 16:19:48 +0000 (18:19 +0200)

Trivial merge