diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-17 03:05:02 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-17 03:05:02 -0500 |
| commit | a2bfbc072e279ff81e6b336acff612b9bc2e5281 (patch) | |
| tree | 89cfe21911e1539e1b7f89d8a10d42abecba2a18 /MAINTAINERS | |
| parent | 5c427ff9e4cc61625d48172ea082ae99e21eea6a (diff) | |
| parent | 82b3cc1a2f5e46300a9dec4a8cc8106dc20a4c23 (diff) | |
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 | |||
| 4304 | RALINK RT2X00 WIRELESS LAN DRIVER | 4304 | RALINK RT2X00 WIRELESS LAN DRIVER |
| 4305 | P: rt2x00 project | 4305 | P: rt2x00 project |
| 4306 | M: Ivo van Doorn <IvDoorn@gmail.com> | 4306 | M: Ivo van Doorn <IvDoorn@gmail.com> |
| 4307 | M: Gertjan van Wingerde <gwingerde@gmail.com> | ||
| 4307 | L: linux-wireless@vger.kernel.org | 4308 | L: linux-wireless@vger.kernel.org |
| 4308 | L: users@rt2x00.serialmonkey.com (moderated for non-subscribers) | 4309 | L: users@rt2x00.serialmonkey.com (moderated for non-subscribers) |
| 4309 | W: http://rt2x00.serialmonkey.com/ | 4310 | W: http://rt2x00.serialmonkey.com/ |
| @@ -4391,7 +4392,7 @@ RFKILL | |||
| 4391 | M: Johannes Berg <johannes@sipsolutions.net> | 4392 | M: Johannes Berg <johannes@sipsolutions.net> |
| 4392 | L: linux-wireless@vger.kernel.org | 4393 | L: linux-wireless@vger.kernel.org |
| 4393 | S: Maintained | 4394 | S: Maintained |
| 4394 | F Documentation/rfkill.txt | 4395 | F: Documentation/rfkill.txt |
| 4395 | F: net/rfkill/ | 4396 | F: net/rfkill/ |
| 4396 | 4397 | ||
| 4397 | RISCOM8 DRIVER | 4398 | RISCOM8 DRIVER |