---

yaml --- r: 90149 b: refs/heads/master c: 7524d7d h: refs/heads/master i: 90147: 8475811 v: v3
git-mirror · Mar 13, 2008 · c56a34b · c56a34b
1 parent e342c2e
commit c56a34b
Show file tree

Hide file tree

Showing 17 changed files with 1 addition and 3,663 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2079fcdc06ea01c084044c348dbcd7b3e335ad49
+refs/heads/master: 7524d7d6de5d5d3f081de8cf5479819fad339661
diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt
@@ -230,14 +230,6 @@ Who:	Jean Delvare <khali@linux-fr.org>
 
 ---------------------------
 
-What:	ieee80211 softmac wireless networking component
-When:	2.6.26 (or after removal of bcm43xx and port of zd1211rw to mac80211)
-Files:	net/ieee80211/softmac
-Why:	No in-kernel drivers will depend on it any longer.
-Who:	John W. Linville <linville@tuxdriver.com>
-
----------------------------
-
 What:	rc80211-simple rate control algorithm for mac80211
 When:	2.6.26
 Files:	net/mac80211/rc80211-simple.c

diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -3548,12 +3548,6 @@ M:	mhoffman@lightlink.com
 L:	lm-sensors@lm-sensors.org
 S:	Maintained
 
-SOFTMAC LAYER (IEEE 802.11)
-P:	Daniel Drake
-M:	dsd@gentoo.org
-L:	linux-wireless@vger.kernel.org
-S:	Obsolete
-
 SOFTWARE RAID (Multiple Disks) SUPPORT
 P:	Ingo Molnar
 M:	mingo@redhat.com