diff options
| author | Steven Whitehouse | 2006-05-12 16:48:52 +0200 |
|---|---|---|
| committer | Steven Whitehouse | 2006-05-12 16:48:52 +0200 |
| commit | 7d63b54a65ce902f9aaa8efe8192aa3b983264d4 (patch) | |
| tree | 250a77bebe92cbd6edac70a649866044295876db /MAINTAINERS | |
| parent | [GFS2] Readpages support (diff) | |
| parent | Linux v2.6.17-rc4 (diff) | |
| download | kernel-qcow2-linux-7d63b54a65ce902f9aaa8efe8192aa3b983264d4.tar.gz kernel-qcow2-linux-7d63b54a65ce902f9aaa8efe8192aa3b983264d4.tar.xz kernel-qcow2-linux-7d63b54a65ce902f9aaa8efe8192aa3b983264d4.zip | |
Merge branch 'master'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f4bd145c007e..c676253ef409 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1498,10 +1498,11 @@ L: netdev@vger.kernel.org S: Maintained IRDA SUBSYSTEM -P: Jean Tourrilhes +P: Samuel Ortiz +M: samuel@sortiz.org L: irda-users@lists.sourceforge.net (subscribers-only) W: http://irda.sourceforge.net/ -S: Odd Fixes +S: Maintained ISAPNP P: Jaroslav Kysela |