diff --git a/[refs] b/[refs]
index a80a392bb8eb..beec3ac26549 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2060f039e8a8bc83b10e6d0f8fb440425560569
+refs/heads/master: 8f0f850e240df5bea027caeb1723142c50e37e57
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index bdbd397138c2..4e14ee7f09bf 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -2588,6 +2588,18 @@ P:	Nicolas Pitre
 M:	nico@cam.org
 S:	Maintained
 
+SOFTMAC LAYER (IEEE 802.11)
+P:	Johannes Berg
+M:	johannes@sipsolutions.net
+P:	Joe Jezak
+M:	josejx@gentoo.org
+P:	Daniel Drake
+M:	dsd@gentoo.org
+W:	http://softmac.sipsolutions.net/
+L:	softmac-dev@sipsolutions.net
+L:	netdev@vger.kernel.org
+S:	Maintained
+
 SOFTWARE RAID (Multiple Disks) SUPPORT
 P:	Ingo Molnar
 M:	mingo@redhat.com