Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into...

Conflicts:
	Documentation/feature-removal-schedule.txt

diff --cc Documentation/feature-removal-schedule.txt
index 4dc4654776657b68f35161ac642e9caa187d15e4,1cf3dbdb15384fec85340509c4dd3318db004b9a..d5ac362daef50f9b7fad5f3ea39188413fe6604a
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -581,22 -555,8 +581,31 @@@ Why:     This driver has been superseded b
  Who:  Alan Stern <stern@rowland.harvard.edu>
  
  ----------------------------
 -Who:  Don Fry <donald.h.fry@intel.com>
 +
 +What:   threeg and interface sysfs files in /sys/devices/platform/acer-wmi
 +When:   2012
 +Why:    In 3.0, we can now autodetect internal 3G device and already have
 +      the threeg rfkill device. So, we plan to remove threeg sysfs support
 +      for it's no longer necessary.
 +
 +      We also plan to remove interface sysfs file that exposed which ACPI-WMI
 +      interface that was used by acer-wmi driver. It will replaced by
 +      information log when acer-wmi initial.
 +Who:    Lee, Chun-Yi <jlee@novell.com>
 +
 +----------------------------
++
 +What: The XFS nodelaylog mount option
 +When: 3.3
 +Why:  The delaylog mode that has been the default since 2.6.39 has proven
 +      stable, and the old code is in the way of additional improvements in
 +      the log code.
 +Who:  Christoph Hellwig <hch@lst.de>
++
++----------------------------
++
+ What: iwlagn alias support
+ When: 3.5
+ Why:  The iwlagn module has been renamed iwlwifi.  The alias will be around
+       for backward compatibility for several cycles and then dropped.
++Who:  Don Fry <donald.h.fry@intel.com>

diff --cc drivers/net/wireless/libertas/main.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/main.c
Simple merge

diff --cc include/linux/if_ether.h
Simple merge

diff --cc net/mac80211/agg-rx.c
Simple merge

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/ibss.c
Simple merge

diff --cc net/mac80211/iface.c
Simple merge

diff --cc net/mac80211/sta_info.c
Simple merge