diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-05 05:06:47 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-05 05:06:47 -0500 |
| commit | 508827ff0ac3981d420edac64a70de7f4e304d38 (patch) | |
| tree | b0cee8ddef9f0ceab68c388e4ae46b7295eb2cb5 /MAINTAINERS | |
| parent | 2c3c3d02f28801d7ad2da4952b2c7ca6621ef221 (diff) | |
| parent | 72e2240f181871675d3a979766330c91d48a1673 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tokenring/tmspci.c
drivers/net/ucc_geth_mii.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e74a133ce271..0d9ea2a4e497 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2466,7 +2466,7 @@ S: Maintained | |||
| 2466 | 2466 | ||
| 2467 | ISDN SUBSYSTEM | 2467 | ISDN SUBSYSTEM |
| 2468 | P: Karsten Keil | 2468 | P: Karsten Keil |
| 2469 | M: kkeil@suse.de | 2469 | M: isdn@linux-pingi.de |
| 2470 | L: isdn4linux@listserv.isdn4linux.de (subscribers-only) | 2470 | L: isdn4linux@listserv.isdn4linux.de (subscribers-only) |
| 2471 | W: http://www.isdn4linux.de | 2471 | W: http://www.isdn4linux.de |
| 2472 | T: git kernel.org:/pub/scm/linux/kernel/kkeil/isdn-2.6.git | 2472 | T: git kernel.org:/pub/scm/linux/kernel/kkeil/isdn-2.6.git |