diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-17 01:09:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-17 01:09:29 -0500 |
| commit | 2bb4646fce8d09916b351d1a62f98db7cec6fc41 (patch) | |
| tree | c1f0d002e69868606eca9d1b919835f422892063 /MAINTAINERS | |
| parent | 6836b9bdd98e3b500cd49512484df68f46e14659 (diff) | |
| parent | b0483e78e5c4c9871fc5541875b3bc006846d46b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fe17b8016bcf..64a237bb01ab 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3411,8 +3411,10 @@ S: Maintained | |||
| 3411 | F: drivers/scsi/sym53c8xx_2/ | 3411 | F: drivers/scsi/sym53c8xx_2/ |
| 3412 | 3412 | ||
| 3413 | LTP (Linux Test Project) | 3413 | LTP (Linux Test Project) |
| 3414 | M: Subrata Modak <subrata@linux.vnet.ibm.com> | 3414 | M: Rishikesh K Rajak <risrajak@linux.vnet.ibm.com> |
| 3415 | M: Mike Frysinger <vapier@gentoo.org> | 3415 | M: Garrett Cooper <yanegomi@gmail.com> |
| 3416 | M: Mike Frysinger <vapier@gentoo.org> | ||
| 3417 | M: Subrata Modak <subrata@linux.vnet.ibm.com> | ||
| 3416 | L: ltp-list@lists.sourceforge.net (subscribers-only) | 3418 | L: ltp-list@lists.sourceforge.net (subscribers-only) |
| 3417 | W: http://ltp.sourceforge.net/ | 3419 | W: http://ltp.sourceforge.net/ |
| 3418 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/galak/ltp.git | 3420 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/galak/ltp.git |