diff --git a/[refs] b/[refs] index ee00ec72a4f6..28bd1e8750e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 089f99d8ac398905f6dc75dd2ce5796ced5dd943 +refs/heads/master: 7c0c3afb6e67004648ca589445e073dba4040509 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index b2afc7ae965b..bdbd397138c2 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3296,6 +3296,15 @@ W: http://www.qsl.net/dl1bke/ L: linux-hams@vger.kernel.org S: Maintained +ZD1211RW WIRELESS DRIVER +P: Daniel Drake +M: dsd@gentoo.org +P: Ulrich Kunitz +M: kune@deine-taler.de +W: http://zd1211.ath.cx/wiki/DriverRewrite +L: zd1211-devs@lists.sourceforge.net (subscribers-only) +S: Maintained + ZF MACHZ WATCHDOG P: Fernando Fuganti M: fuganti@netbank.com.br