diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-10-15 23:29:12 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-10-15 23:29:12 -0400 |
| commit | 4c0e799a9a6dc64426ddb6c03aea1a154357658f (patch) | |
| tree | 2d9aa9493d80fceb178a63bf15bb3d9edfc5fbae /MAINTAINERS | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
| parent | b8d055a878ee0f997ded40649701089d2486f850 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
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 | |||
| 4548 | P: Mark Brown | 4548 | P: Mark Brown |
| 4549 | M: broonie@opensource.wolfsonmicro.com | 4549 | M: broonie@opensource.wolfsonmicro.com |
| 4550 | P: Liam Girdwood | 4550 | P: Liam Girdwood |
| 4551 | M: liam.girdwood@wolfsonmicro.com | 4551 | M: lrg@slimlogic.co.uk |
| 4552 | L: linux-input@vger.kernel.org | 4552 | L: linux-input@vger.kernel.org |
| 4553 | T: git git://opensource.wolfsonmicro.com/linux-2.6-touch | 4553 | T: git git://opensource.wolfsonmicro.com/linux-2.6-touch |
| 4554 | W: http://opensource.wolfsonmicro.com/node/7 | 4554 | W: http://opensource.wolfsonmicro.com/node/7 |