summary refs log tree commit diff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-09-02 08:02:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-02 08:02:20 -0700
commit7d3e2eb1786fafa186eb8bc276edef75ba69e023 (patch)
treee3fb1d4f891a45737045463b45e54f11cd29da47 /MAINTAINERS
parent2dc7e555e33e645df70a8aa89c529de1902f0064 (diff)
parent355c06633e233a57155b827ebe99b91c35bc1f5c (diff)
downloadlinux-7d3e2eb1786fafa186eb8bc276edef75ba69e023.tar.gz
Merge branch 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue updates from Tejun Heo:
 "Only three trivial changes for workqueue this time - doc, MAINTAINERS
  and EXPORT_SYMBOL updates"

* 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: fix some docbook warnings
  workqueue: Make flush_workqueue() available again to non GPL modules
  workqueue: add myself as a dedicated reviwer
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 6eee6dbf15a4..68760a91d399 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11244,6 +11244,7 @@ F:	sound/soc/codecs/wm*
 
 WORKQUEUE
 M:	Tejun Heo <tj@kernel.org>
+R:	Lai Jiangshan <jiangshanlai@gmail.com>
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git
 S:	Maintained
 F:	include/linux/workqueue.h