From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 May 2012 00:36:56 +0000 (-0700)
Subject: Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
X-Git-Tag: for-linus-20120531~119
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=c54894cd4672d513e43e0d17d7b0387bf6b2c2c4;p=linux-2.6-block.git

Merge branch 'for-3.5' of git://git./linux/kernel/git/tj/wq

Pull workqueue changes from Tejun Heo:
 "Nothing exciting.  Most are updates to debug stuff and related fixes.
  Two not-too-critical bugs are fixed - WARN_ON() triggering spurious
  during cpu offlining and unlikely lockdep related oops."

* 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  lockdep: fix oops in processing workqueue
  workqueue: skip nr_running sanity check in worker_enter_idle() if trustee is active
  workqueue: Catch more locking problems with flush_work()
  workqueue: change BUG_ON() to WARN_ON()
  trace: Remove unused workqueue tracer
---

c54894cd4672d513e43e0d17d7b0387bf6b2c2c4