Merge branch 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jan 2011 21:38:57 +0000 (13:38 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jan 2011 21:38:57 +0000 (13:38 -0800)
commit5bf7a6503ff416214b9a53569677dbf07657e6fd
tree0dc8e8dbc30a23d466a327bef05e78c571f2b8a3
parent0f5c2ac58f22fd41deaeeb45ee752d4ae55f0d01
parent42c025f3de9042d9c9abd9a6f6205d1a0f4bcadf
Merge branch 'fixes-2.6.38' of git://git./linux/kernel/git/tj/wq

* 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: note the nested NOT_RUNNING test in worker_clr_flags() isn't a noop
  workqueue: relax lockdep annotation on flush_work()
include/linux/lockdep.h