diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2010-04-15 16:21:34 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-04-15 16:21:34 -0400 |
| commit | 5c01d5669356e13f0fb468944c1dd4c6a7e978ad (patch) | |
| tree | fa43345288d7b25fac92b3b35360a177c4947313 /Documentation/feature-removal-schedule.txt | |
| parent | Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (diff) | |
| parent | wireless: rt2x00: rt2800usb: identify Sitecom devices (diff) | |
| download | linux-dev-5c01d5669356e13f0fb468944c1dd4c6a7e978ad.tar.xz linux-dev-5c01d5669356e13f0fb468944c1dd4c6a7e978ad.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/wl12xx/wl1271_main.c
Diffstat (limited to 'Documentation/feature-removal-schedule.txt')
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 267e90582d20..116a13c4f13f 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -520,7 +520,6 @@ Who: Hans de Goede <hdegoede@redhat.com> ---------------------------- - What: corgikbd, spitzkbd, tosakbd driver When: 2.6.35 Files: drivers/input/keyboard/{corgi,spitz,tosa}kbd.c @@ -608,3 +607,24 @@ Why: Useful in 2003, implementation is a hack. Generally invoked by accident today. Seen as doing more harm than good. Who: Len Brown <len.brown@intel.com> + +---------------------------- + +What: iwlwifi 50XX module parameters +When: 2.6.40 +Why: The "..50" modules parameters were used to configure 5000 series and + up devices; different set of module parameters also available for 4965 + with same functionalities. Consolidate both set into single place + in drivers/net/wireless/iwlwifi/iwl-agn.c + +Who: Wey-Yi Guy <wey-yi.w.guy@intel.com> + +---------------------------- + +What: iwl4965 alias support +When: 2.6.40 +Why: Internal alias support has been present in module-init-tools for some + time, the MODULE_ALIAS("iwl4965") boilerplate aliases can be removed + with no impact. + +Who: Wey-Yi Guy <wey-yi.w.guy@intel.com> |