diff --git a/CREDITS b/CREDITS index d439f5a1bc00..007f8aa8a527 100644 --- a/CREDITS +++ b/CREDITS @@ -574,6 +574,9 @@ N: Zach Brown E: zab@zabbo.net D: maestro pci sound +N: Zefan Li +D: Contribution to control group stuff + N: David Brownell D: Kernel engineer, mentor, and friend. Maintained USB EHCI and D: gadget layers, SPI subsystem, GPIO subsystem, and more than a few diff --git a/MAINTAINERS b/MAINTAINERS index c27f3190737f..2c097bb9352b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5775,7 +5775,6 @@ F: kernel/context_tracking.c CONTROL GROUP (CGROUP) M: Tejun Heo -M: Zefan Li M: Johannes Weiner M: Michal Koutný L: cgroups@vger.kernel.org @@ -5804,7 +5803,6 @@ F: include/linux/blk-cgroup.h CONTROL GROUP - CPUSET M: Waiman Long -M: Zefan Li L: cgroups@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git