diff --git a/[refs] b/[refs] index 23acb2668a12..1c4ebd7f8dc2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89796f64a20d31e74ee0051df2e26812c852e734 +refs/heads/master: e089764596ccde1037f2849fcee002c68986e67c diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index eeacfc56b35d..f5b7d0b47c2d 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3342,6 +3342,13 @@ L: reiserfs-devel@vger.kernel.org W: http://www.namesys.com S: Supported +RFKILL +P: Ivo van Doorn +M: IvDoorn@gmail.com +L: netdev@vger.kernel.org +S: Maintained +F: net/rfkill + ROCKETPORT DRIVER P: Comtrol Corp. W: http://www.comtrol.com