diff options
author | David S. Miller <davem@davemloft.net> | 2012-05-16 22:17:37 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-16 22:17:37 -0400 |
commit | 028940342a906db8da014a7603a0deddc2c323dd (patch) | |
tree | 688dbc38a3e218f2493d311b1d70a67668837347 /MAINTAINERS | |
parent | be3eed2e96340d3c7a4d1ea1d63e7bd6095d1e34 (diff) | |
parent | 0e93b4b304ae052ba1bc73f6d34a68556fe93429 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 887c965c2711..490dd6e640ac 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1969,10 +1969,9 @@ S: Maintained | |||
1969 | F: drivers/net/ethernet/ti/cpmac.c | 1969 | F: drivers/net/ethernet/ti/cpmac.c |
1970 | 1970 | ||
1971 | CPU FREQUENCY DRIVERS | 1971 | CPU FREQUENCY DRIVERS |
1972 | M: Dave Jones <davej@redhat.com> | 1972 | M: Rafael J. Wysocki <rjw@sisk.pl> |
1973 | L: cpufreq@vger.kernel.org | 1973 | L: cpufreq@vger.kernel.org |
1974 | W: http://www.codemonkey.org.uk/projects/cpufreq/ | 1974 | L: linux-pm@vger.kernel.org |
1975 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git | ||
1976 | S: Maintained | 1975 | S: Maintained |
1977 | F: drivers/cpufreq/ | 1976 | F: drivers/cpufreq/ |
1978 | F: include/linux/cpufreq.h | 1977 | F: include/linux/cpufreq.h |
@@ -4032,6 +4031,7 @@ F: Documentation/scsi/53c700.txt | |||
4032 | F: drivers/scsi/53c700* | 4031 | F: drivers/scsi/53c700* |
4033 | 4032 | ||
4034 | LED SUBSYSTEM | 4033 | LED SUBSYSTEM |
4034 | M: Bryan Wu <bryan.wu@canonical.com> | ||
4035 | M: Richard Purdie <rpurdie@rpsys.net> | 4035 | M: Richard Purdie <rpurdie@rpsys.net> |
4036 | S: Maintained | 4036 | S: Maintained |
4037 | F: drivers/leds/ | 4037 | F: drivers/leds/ |