Merge branch 'fixes-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Apr 2011 16:15:40 +0000 (09:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Apr 2011 16:15:40 +0000 (09:15 -0700)
commit3fd9952df4964fac7d5868ba48eadcc9dae3ba46
treeac5ad53b758329fbd5d38972a26fb8380092a649
parent1be6a1f89f131e9c3d22f819ec542be9cda8c9e3
parent5035b20fa5cd146b66f5f89619c20a4177fb736d
Merge branch 'fixes-2.6.39' of git://git./linux/kernel/git/tj/wq

* 'fixes-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: fix deadlock in worker_maybe_bind_and_lock()
  workqueue: Document debugging tricks

Fix up trivial spelling conflict in kernel/workqueue.c