aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-07-13 15:15:43 -0400
committerTony Luck <tony.luck@intel.com>2005-07-13 15:15:43 -0400
commit99ad25a313bda566a346b46a6015afa65bc0a02b (patch)
treeb9443fed1ab74f320c4ee0791864ee96d7c069df /MAINTAINERS
parentf62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff)
parent9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff)
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 37fb1e2ec687..5d014725901c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1240,7 +1240,7 @@ S: Maintained
1240 1240
1241IRDA SUBSYSTEM 1241IRDA SUBSYSTEM
1242P: Jean Tourrilhes 1242P: Jean Tourrilhes
1243L: irda-users@lists.sourceforge.net 1243L: irda-users@lists.sourceforge.net (subscribers-only)
1244W: http://irda.sourceforge.net/ 1244W: http://irda.sourceforge.net/
1245S: Maintained 1245S: Maintained
1246 1246