diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-24 23:37:52 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-24 23:37:52 -0400 |
| commit | 308f0a5898033691d050374a949bbfe173987a16 (patch) | |
| tree | 9a7f2798e2f778d6ec126c2f9a1e2c0ba007c742 /MAINTAINERS | |
| parent | 0035a1dc8f56f2c92f4246b0c8b5f6d1ee10c76b (diff) | |
| parent | b345dc7da026016b65162b1ca7cfcd2c7212a285 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 90dcbbcad91c..87bdced169a4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4343,6 +4343,16 @@ L: linux-wireless@vger.kernel.org | |||
| 4343 | W: http://oops.ghostprotocols.net:81/blog | 4343 | W: http://oops.ghostprotocols.net:81/blog |
| 4344 | S: Maintained | 4344 | S: Maintained |
| 4345 | 4345 | ||
| 4346 | WM97XX TOUCHSCREEN DRIVERS | ||
| 4347 | P: Mark Brown | ||
| 4348 | M: broonie@opensource.wolfsonmicro.com | ||
| 4349 | P: Liam Girdwood | ||
| 4350 | M: liam.girdwood@wolfsonmicro.com | ||
| 4351 | L: linux-input@vger.kernel.org | ||
| 4352 | T: git git://opensource.wolfsonmicro.com/linux-2.6-touch | ||
| 4353 | W: http://opensource.wolfsonmicro.com/node/7 | ||
| 4354 | S: Supported | ||
| 4355 | |||
| 4346 | X.25 NETWORK LAYER | 4356 | X.25 NETWORK LAYER |
| 4347 | P: Henner Eisen | 4357 | P: Henner Eisen |
| 4348 | M: eis@baty.hanse.de | 4358 | M: eis@baty.hanse.de |