diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-17 09:05:02 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-17 09:05:02 +0100 |
| commit | a2bfbc072e279ff81e6b336acff612b9bc2e5281 (patch) | |
| tree | 89cfe21911e1539e1b7f89d8a10d42abecba2a18 /MAINTAINERS | |
| parent | KS8695: fix ks8695_rx() unreasonable action. (diff) | |
| parent | ppp: fix BUG on non-linear SKB (multilink receive) (diff) | |
| download | linux-a2bfbc072e279ff81e6b336acff612b9bc2e5281.tar.xz linux-a2bfbc072e279ff81e6b336acff612b9bc2e5281.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/can/Kconfig
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fe1cd41b660f..b2e3f3507ca3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4304,6 +4304,7 @@ F: drivers/video/aty/aty128fb.c RALINK RT2X00 WIRELESS LAN DRIVER P: rt2x00 project M: Ivo van Doorn <IvDoorn@gmail.com> +M: Gertjan van Wingerde <gwingerde@gmail.com> L: linux-wireless@vger.kernel.org L: users@rt2x00.serialmonkey.com (moderated for non-subscribers) W: http://rt2x00.serialmonkey.com/ @@ -4391,7 +4392,7 @@ RFKILL M: Johannes Berg <johannes@sipsolutions.net> L: linux-wireless@vger.kernel.org S: Maintained -F Documentation/rfkill.txt +F: Documentation/rfkill.txt F: net/rfkill/ RISCOM8 DRIVER |