diff --git a/[refs] b/[refs] index d1e2b5339cbc..561637c214f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a879bf582dfb3a79d30d76ca3af2ae8a0f39010c +refs/heads/master: f8407f26b4c9a36aab74fcdbd6e14ffe4f8d9476 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 98710933ac10..8afba6321e24 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1692,6 +1692,13 @@ M: Andy Whitcroft S: Supported F: scripts/checkpatch.pl +CHINESE DOCUMENTATION +M: Harry Wei +L: xiyoulinuxkernelgroup@googlegroups.com +L: linux-kernel@zh-kernel.org (moderated for non-subscribers) +S: Maintained +F: Documentation/zh_CN/ + CISCO VIC ETHERNET NIC DRIVER M: Vasanthy Kolluri M: Roopa Prabhu