tree ac5ad53b758329fbd5d38972a26fb8380092a649
parent 1be6a1f89f131e9c3d22f819ec542be9cda8c9e3
parent 5035b20fa5cd146b66f5f89619c20a4177fb736d
author Linus Torvalds <torvalds@linux-foundation.org> 1304180140 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1304180140 -0700

Merge branch 'fixes-2.6.39' of git://git.kernel.org/pub/scm/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