diff options
author | Mark Brown <broonie@linaro.org> | 2013-06-10 05:28:50 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-06-10 05:28:50 -0400 |
commit | 97a47ce9d26db253d5eab8f90d186d9a46b77710 (patch) | |
tree | 7ef83e9a194e3c1587b25ba3865d7e752ec061dc /MAINTAINERS | |
parent | ed750192041fc4bc7a066c34db74f56c23024fcf (diff) | |
parent | d9f1f489c034829c1082c0e7efa09450e716d23e (diff) |
Merge remote-tracking branch 'asoc/fix/maintainers' into asoc-linus
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 250dc970c62d..6ca4227a4f43 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -9004,7 +9004,7 @@ S: Maintained | |||
9004 | F: drivers/net/wireless/wl3501* | 9004 | F: drivers/net/wireless/wl3501* |
9005 | 9005 | ||
9006 | WM97XX TOUCHSCREEN DRIVERS | 9006 | WM97XX TOUCHSCREEN DRIVERS |
9007 | M: Mark Brown <broonie@opensource.wolfsonmicro.com> | 9007 | M: Mark Brown <broonie@kernel.org> |
9008 | M: Liam Girdwood <lrg@slimlogic.co.uk> | 9008 | M: Liam Girdwood <lrg@slimlogic.co.uk> |
9009 | L: linux-input@vger.kernel.org | 9009 | L: linux-input@vger.kernel.org |
9010 | T: git git://opensource.wolfsonmicro.com/linux-2.6-touch | 9010 | T: git git://opensource.wolfsonmicro.com/linux-2.6-touch |
@@ -9014,7 +9014,6 @@ F: drivers/input/touchscreen/*wm97* | |||
9014 | F: include/linux/wm97xx.h | 9014 | F: include/linux/wm97xx.h |
9015 | 9015 | ||
9016 | WOLFSON MICROELECTRONICS DRIVERS | 9016 | WOLFSON MICROELECTRONICS DRIVERS |
9017 | M: Mark Brown <broonie@opensource.wolfsonmicro.com> | ||
9018 | L: patches@opensource.wolfsonmicro.com | 9017 | L: patches@opensource.wolfsonmicro.com |
9019 | T: git git://opensource.wolfsonmicro.com/linux-2.6-asoc | 9018 | T: git git://opensource.wolfsonmicro.com/linux-2.6-asoc |
9020 | T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus | 9019 | T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus |