commit c54894cd4672d513e43e0d17d7b0387bf6b2c2c4
author Linus Torvalds <torvalds@linux-foundation.org> Tue May 22 17:36:56 2012 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Tue May 22 17:36:56 2012 -0700
tree 85a540716d82570f98a92b85c66ea5875f983f46
parent fb09bafda67041b74a668dc9d77735e36bd33d3b
parent 4d82a1debbffec129cc387aafa8f40b7bbab3297

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