diff --git a/[refs] b/[refs] index a5070c04ff77..1bca649754b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ffdd071e0386645d539a7386f77669777412fea +refs/heads/master: beaf53bff7985ad57b5b6983f3d6142380449370 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 6d6a61ce12b4..f3b5a391e074 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1487,6 +1487,13 @@ L: linux-usb-devel@lists.sourceforge.net L: linuxppc-embedded@ozlabs.org S: Maintained +FREESCALE QUICC ENGINE UCC ETHERNET DRIVER +P: Li Yang +M: leoli@freescale.com +L: netdev@vger.kernel.org +L: linuxppc-embedded@ozlabs.org +S: Maintained + FILE LOCKING (flock() and fcntl()/lockf()) P: Matthew Wilcox M: matthew@wil.cx