]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 May 2012 00:36:56 +0000 (17:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 May 2012 00:36:56 +0000 (17:36 -0700)
commit2216ce6a4de42de611b90a3ebb0c5b343d094f20
tree85a540716d82570f98a92b85c66ea5875f983f46
parent3c7abb468f5e6d655ab61f38a4e0286c5fbeed88
parentb106c154e1a85f84a341e4d44ee2a80ef16a6f20
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
kernel/timer.c