From: John W. Linville Date: Tue, 11 Oct 2011 19:35:42 +0000 (-0400) Subject: Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into... X-Git-Tag: MMI-PSA29.97-13-9~18194^2~104^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=094daf7db7c47861009899ce23f9177d761e20b0;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem Conflicts: Documentation/feature-removal-schedule.txt --- 094daf7db7c47861009899ce23f9177d761e20b0 diff --cc Documentation/feature-removal-schedule.txt index 4dc465477665,1cf3dbdb1538..d5ac362daef5 --- a/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 ---------------------------- + +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