From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 30 Apr 2011 16:15:40 +0000 (-0700)
Subject: Merge branch 'fixes-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
X-Git-Tag: v2.6.39-rc6~15
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=3fd9952df4964fac7d5868ba48eadcc9dae3ba46;p=~andy%2Flinux

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
---

3fd9952df4964fac7d5868ba48eadcc9dae3ba46