From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 6 Aug 2013 20:58:34 +0000 (-0700)
Subject: Merge branch 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
X-Git-Tag: v3.11-rc5~32
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=4264bc13712b40be38d8fc01a37c34279a27e30d;p=karo-tx-linux.git

Merge branch 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

Pull two workqueue fixes from Tejun Heo:
 "A lockdep notation update so that nested work_on_cpu() invocations
  don't lead to spurious lockdep warnings and fix for an unbound attr
  bug which made what's shown in sysfs deviate from the actual ones.
  Both patches have pretty limited scope"

* 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: copy workqueue_attrs with all fields
  workqueue: allow work_on_cpu() to be called recursively
---

4264bc13712b40be38d8fc01a37c34279a27e30d