diff --git a/[refs] b/[refs]
index e06d048475a9..57f89eb37a44 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f07d5b946510a54937a75a3654941e855ffdc4c2
+refs/heads/master: f353976dc2f31c9be092d4cb9476a39ba3973926
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index d6a8e5b434ec..5e3355871416 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -1480,10 +1480,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