aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2008-10-15 23:29:12 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2008-10-15 23:29:12 -0400
commit4c0e799a9a6dc64426ddb6c03aea1a154357658f (patch)
tree2d9aa9493d80fceb178a63bf15bb3d9edfc5fbae /MAINTAINERS
parent3fa8749e584b55f1180411ab1b51117190bac1e5 (diff)
parentb8d055a878ee0f997ded40649701089d2486f850 (diff)
Merge branch 'next' into for-linus
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 8dae4555f10e..83de0f0c541f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4548,7 +4548,7 @@ WM97XX TOUCHSCREEN DRIVERS
4548P: Mark Brown 4548P: Mark Brown
4549M: broonie@opensource.wolfsonmicro.com 4549M: broonie@opensource.wolfsonmicro.com
4550P: Liam Girdwood 4550P: Liam Girdwood
4551M: liam.girdwood@wolfsonmicro.com 4551M: lrg@slimlogic.co.uk
4552L: linux-input@vger.kernel.org 4552L: linux-input@vger.kernel.org
4553T: git git://opensource.wolfsonmicro.com/linux-2.6-touch 4553T: git git://opensource.wolfsonmicro.com/linux-2.6-touch
4554W: http://opensource.wolfsonmicro.com/node/7 4554W: http://opensource.wolfsonmicro.com/node/7