projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f5c2ac 42c025f)
Merge branch 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
authorLinus Torvalds <[email protected]>
Fri, 21 Jan 2011 21:38:57 +0000 (13:38 -0800)
committerLinus Torvalds <[email protected]>
Fri, 21 Jan 2011 21:38:57 +0000 (13:38 -0800)
* '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()

1  2 
include/linux/lockdep.h patch | diff1 | diff2 | blob | history

diff --cc include/linux/lockdep.h
Simple merge
John Crispins staging tree