From: Stephen Rothwell Date: Tue, 4 Oct 2011 02:33:58 +0000 (+1100) Subject: Merge remote-tracking branch 'wireless/master' X-Git-Tag: next-20111004~56 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8901680fbdb90c72948e8c01cb923f9537126482;p=karo-tx-linux.git Merge remote-tracking branch 'wireless/master' Conflicts: Documentation/feature-removal-schedule.txt --- 8901680fbdb90c72948e8c01cb923f9537126482 diff --cc Documentation/feature-removal-schedule.txt index ead08f1c7c93,1cf3dbdb1538..a2dc0c2175c5 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@@ -558,22 -555,8 +558,30 @@@ Why: This driver has been superseded b Who: Alan Stern ---------------------------- + +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 + +---------------------------- +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 ++ ++---------------------------- ++ + 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 ++Who: Don Fry