From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Jan 2011 21:38:57 +0000 (-0800)
Subject: Merge branch 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
X-Git-Tag: v2.6.38-rc2~6
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=5bf7a6503ff416214b9a53569677dbf07657e6fd

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()
---

5bf7a6503ff416214b9a53569677dbf07657e6fd