diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-11 23:46:58 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-11 23:46:58 -0400 |
commit | 66e61060d7ad9fcf61475fb836fb5987db7a7ee0 (patch) | |
tree | a0abe3fb2fa8858261dc41df9444c0e0ca85f1a6 /MAINTAINERS | |
parent | a89c3e956ae78cec8926b92f2d61b7a5b675e787 (diff) | |
parent | f242e50eee1ec7692c4854d94e8cd543991cce71 (diff) |
Merge branch 'asoc-ab8500' into for-3.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 50 |
1 files changed, 33 insertions, 17 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d0526640f717..62b94662506f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1077,7 +1077,7 @@ F: drivers/media/video/s5p-fimc/ | |||
1077 | ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT | 1077 | ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT |
1078 | M: Kyungmin Park <kyungmin.park@samsung.com> | 1078 | M: Kyungmin Park <kyungmin.park@samsung.com> |
1079 | M: Kamil Debski <k.debski@samsung.com> | 1079 | M: Kamil Debski <k.debski@samsung.com> |
1080 | M: Jeongtae Park <jtp.park@samsung.com> | 1080 | M: Jeongtae Park <jtp.park@samsung.com> |
1081 | L: linux-arm-kernel@lists.infradead.org | 1081 | L: linux-arm-kernel@lists.infradead.org |
1082 | L: linux-media@vger.kernel.org | 1082 | L: linux-media@vger.kernel.org |
1083 | S: Maintained | 1083 | S: Maintained |
@@ -1743,10 +1743,10 @@ F: include/linux/can/platform/ | |||
1743 | CAPABILITIES | 1743 | CAPABILITIES |
1744 | M: Serge Hallyn <serge.hallyn@canonical.com> | 1744 | M: Serge Hallyn <serge.hallyn@canonical.com> |
1745 | L: linux-security-module@vger.kernel.org | 1745 | L: linux-security-module@vger.kernel.org |
1746 | S: Supported | 1746 | S: Supported |
1747 | F: include/linux/capability.h | 1747 | F: include/linux/capability.h |
1748 | F: security/capability.c | 1748 | F: security/capability.c |
1749 | F: security/commoncap.c | 1749 | F: security/commoncap.c |
1750 | F: kernel/capability.c | 1750 | F: kernel/capability.c |
1751 | 1751 | ||
1752 | CELL BROADBAND ENGINE ARCHITECTURE | 1752 | CELL BROADBAND ENGINE ARCHITECTURE |
@@ -2146,11 +2146,11 @@ S: Orphan | |||
2146 | F: drivers/net/wan/pc300* | 2146 | F: drivers/net/wan/pc300* |
2147 | 2147 | ||
2148 | CYTTSP TOUCHSCREEN DRIVER | 2148 | CYTTSP TOUCHSCREEN DRIVER |
2149 | M: Javier Martinez Canillas <javier@dowhile0.org> | 2149 | M: Javier Martinez Canillas <javier@dowhile0.org> |
2150 | L: linux-input@vger.kernel.org | 2150 | L: linux-input@vger.kernel.org |
2151 | S: Maintained | 2151 | S: Maintained |
2152 | F: drivers/input/touchscreen/cyttsp* | 2152 | F: drivers/input/touchscreen/cyttsp* |
2153 | F: include/linux/input/cyttsp.h | 2153 | F: include/linux/input/cyttsp.h |
2154 | 2154 | ||
2155 | DAMA SLAVE for AX.25 | 2155 | DAMA SLAVE for AX.25 |
2156 | M: Joerg Reuter <jreuter@yaina.de> | 2156 | M: Joerg Reuter <jreuter@yaina.de> |
@@ -2270,7 +2270,7 @@ F: include/linux/device-mapper.h | |||
2270 | F: include/linux/dm-*.h | 2270 | F: include/linux/dm-*.h |
2271 | 2271 | ||
2272 | DIOLAN U2C-12 I2C DRIVER | 2272 | DIOLAN U2C-12 I2C DRIVER |
2273 | M: Guenter Roeck <guenter.roeck@ericsson.com> | 2273 | M: Guenter Roeck <linux@roeck-us.net> |
2274 | L: linux-i2c@vger.kernel.org | 2274 | L: linux-i2c@vger.kernel.org |
2275 | S: Maintained | 2275 | S: Maintained |
2276 | F: drivers/i2c/busses/i2c-diolan-u2c.c | 2276 | F: drivers/i2c/busses/i2c-diolan-u2c.c |
@@ -2930,6 +2930,13 @@ F: Documentation/power/freezing-of-tasks.txt | |||
2930 | F: include/linux/freezer.h | 2930 | F: include/linux/freezer.h |
2931 | F: kernel/freezer.c | 2931 | F: kernel/freezer.c |
2932 | 2932 | ||
2933 | FRONTSWAP API | ||
2934 | M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | ||
2935 | L: linux-kernel@vger.kernel.org | ||
2936 | S: Maintained | ||
2937 | F: mm/frontswap.c | ||
2938 | F: include/linux/frontswap.h | ||
2939 | |||
2933 | FS-CACHE: LOCAL CACHING FOR NETWORK FILESYSTEMS | 2940 | FS-CACHE: LOCAL CACHING FOR NETWORK FILESYSTEMS |
2934 | M: David Howells <dhowells@redhat.com> | 2941 | M: David Howells <dhowells@redhat.com> |
2935 | L: linux-cachefs@redhat.com | 2942 | L: linux-cachefs@redhat.com |
@@ -3138,7 +3145,7 @@ F: drivers/tty/hvc/ | |||
3138 | 3145 | ||
3139 | HARDWARE MONITORING | 3146 | HARDWARE MONITORING |
3140 | M: Jean Delvare <khali@linux-fr.org> | 3147 | M: Jean Delvare <khali@linux-fr.org> |
3141 | M: Guenter Roeck <guenter.roeck@ericsson.com> | 3148 | M: Guenter Roeck <linux@roeck-us.net> |
3142 | L: lm-sensors@lm-sensors.org | 3149 | L: lm-sensors@lm-sensors.org |
3143 | W: http://www.lm-sensors.org/ | 3150 | W: http://www.lm-sensors.org/ |
3144 | T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ | 3151 | T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ |
@@ -4096,6 +4103,8 @@ F: drivers/scsi/53c700* | |||
4096 | LED SUBSYSTEM | 4103 | LED SUBSYSTEM |
4097 | M: Bryan Wu <bryan.wu@canonical.com> | 4104 | M: Bryan Wu <bryan.wu@canonical.com> |
4098 | M: Richard Purdie <rpurdie@rpsys.net> | 4105 | M: Richard Purdie <rpurdie@rpsys.net> |
4106 | L: linux-leds@vger.kernel.org | ||
4107 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git | ||
4099 | S: Maintained | 4108 | S: Maintained |
4100 | F: drivers/leds/ | 4109 | F: drivers/leds/ |
4101 | F: include/linux/leds.h | 4110 | F: include/linux/leds.h |
@@ -4411,6 +4420,13 @@ S: Orphan | |||
4411 | F: drivers/video/matrox/matroxfb_* | 4420 | F: drivers/video/matrox/matroxfb_* |
4412 | F: include/linux/matroxfb.h | 4421 | F: include/linux/matroxfb.h |
4413 | 4422 | ||
4423 | MAX16065 HARDWARE MONITOR DRIVER | ||
4424 | M: Guenter Roeck <linux@roeck-us.net> | ||
4425 | L: lm-sensors@lm-sensors.org | ||
4426 | S: Maintained | ||
4427 | F: Documentation/hwmon/max16065 | ||
4428 | F: drivers/hwmon/max16065.c | ||
4429 | |||
4414 | MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER | 4430 | MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER |
4415 | M: "Hans J. Koch" <hjk@hansjkoch.de> | 4431 | M: "Hans J. Koch" <hjk@hansjkoch.de> |
4416 | L: lm-sensors@lm-sensors.org | 4432 | L: lm-sensors@lm-sensors.org |
@@ -5149,7 +5165,7 @@ F: drivers/leds/leds-pca9532.c | |||
5149 | F: include/linux/leds-pca9532.h | 5165 | F: include/linux/leds-pca9532.h |
5150 | 5166 | ||
5151 | PCA9541 I2C BUS MASTER SELECTOR DRIVER | 5167 | PCA9541 I2C BUS MASTER SELECTOR DRIVER |
5152 | M: Guenter Roeck <guenter.roeck@ericsson.com> | 5168 | M: Guenter Roeck <linux@roeck-us.net> |
5153 | L: linux-i2c@vger.kernel.org | 5169 | L: linux-i2c@vger.kernel.org |
5154 | S: Maintained | 5170 | S: Maintained |
5155 | F: drivers/i2c/muxes/i2c-mux-pca9541.c | 5171 | F: drivers/i2c/muxes/i2c-mux-pca9541.c |
@@ -5169,7 +5185,7 @@ S: Maintained | |||
5169 | F: drivers/firmware/pcdp.* | 5185 | F: drivers/firmware/pcdp.* |
5170 | 5186 | ||
5171 | PCI ERROR RECOVERY | 5187 | PCI ERROR RECOVERY |
5172 | M: Linas Vepstas <linasvepstas@gmail.com> | 5188 | M: Linas Vepstas <linasvepstas@gmail.com> |
5173 | L: linux-pci@vger.kernel.org | 5189 | L: linux-pci@vger.kernel.org |
5174 | S: Supported | 5190 | S: Supported |
5175 | F: Documentation/PCI/pci-error-recovery.txt | 5191 | F: Documentation/PCI/pci-error-recovery.txt |
@@ -5299,7 +5315,7 @@ F: drivers/video/fb-puv3.c | |||
5299 | F: drivers/rtc/rtc-puv3.c | 5315 | F: drivers/rtc/rtc-puv3.c |
5300 | 5316 | ||
5301 | PMBUS HARDWARE MONITORING DRIVERS | 5317 | PMBUS HARDWARE MONITORING DRIVERS |
5302 | M: Guenter Roeck <guenter.roeck@ericsson.com> | 5318 | M: Guenter Roeck <linux@roeck-us.net> |
5303 | L: lm-sensors@lm-sensors.org | 5319 | L: lm-sensors@lm-sensors.org |
5304 | W: http://www.lm-sensors.org/ | 5320 | W: http://www.lm-sensors.org/ |
5305 | W: http://www.roeck-us.net/linux/drivers/ | 5321 | W: http://www.roeck-us.net/linux/drivers/ |
@@ -7293,11 +7309,11 @@ F: Documentation/DocBook/uio-howto.tmpl | |||
7293 | F: drivers/uio/ | 7309 | F: drivers/uio/ |
7294 | F: include/linux/uio*.h | 7310 | F: include/linux/uio*.h |
7295 | 7311 | ||
7296 | UTIL-LINUX-NG PACKAGE | 7312 | UTIL-LINUX PACKAGE |
7297 | M: Karel Zak <kzak@redhat.com> | 7313 | M: Karel Zak <kzak@redhat.com> |
7298 | L: util-linux-ng@vger.kernel.org | 7314 | L: util-linux@vger.kernel.org |
7299 | W: http://kernel.org/~kzak/util-linux-ng/ | 7315 | W: http://en.wikipedia.org/wiki/Util-linux |
7300 | T: git git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git | 7316 | T: git git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git |
7301 | S: Maintained | 7317 | S: Maintained |
7302 | 7318 | ||
7303 | UVESAFB DRIVER | 7319 | UVESAFB DRIVER |