diff --git a/[refs] b/[refs] index a8c2f1532ad2..e43dc70ac8eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1091fea295825d99c3f7c69a58c057e7d972389 +refs/heads/master: 838e7a03a31b890ee82c74039b84c05fa237bd46 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 296c3d7cdb50..ba8603ce4441 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4565,6 +4565,14 @@ L: linux-abi-devel@lists.sourceforge.net S: Maintained F: include/linux/personality.h +PHONET PROTOCOL +M: Remi Denis-Courmont +S: Supported +F: Documentation/networking/phonet.txt +F: include/linux/phonet.h +F: include/net/phonet/ +F: net/phonet/ + PHRAM MTD DRIVER M: Joern Engel L: linux-mtd@lists.infradead.org