diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-04-12 16:18:44 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-12 16:18:44 -0400 |
| commit | 252f4bf400df1712408fe83ba199a66a1b57ab1d (patch) | |
| tree | e07fa00abdd55b31e22567786c78635f32c6a66c /Documentation/feature-removal-schedule.txt | |
| parent | 6ba1037c3d871ab70e342631516dbf841c35b086 (diff) | |
| parent | b37e3b6d64358604960b35e8ecbb7aed22e0926e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/ath/ar9170/main.c
drivers/net/wireless/ath/ar9170/phy.c
drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
Diffstat (limited to 'Documentation/feature-removal-schedule.txt')
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index e38ccae81710..46679e48967a 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
| @@ -35,17 +35,6 @@ Who: Luis R. Rodriguez <lrodriguez@atheros.com> | |||
| 35 | 35 | ||
| 36 | --------------------------- | 36 | --------------------------- |
| 37 | 37 | ||
| 38 | What: AR9170USB | ||
| 39 | When: 2.6.40 | ||
| 40 | |||
| 41 | Why: This driver is deprecated and the firmware is no longer | ||
| 42 | maintained. The replacement driver "carl9170" has been | ||
| 43 | around for a while, so the devices are still supported. | ||
| 44 | |||
| 45 | Who: Christian Lamparter <chunkeey@googlemail.com> | ||
| 46 | |||
| 47 | --------------------------- | ||
| 48 | |||
| 49 | What: IRQF_SAMPLE_RANDOM | 38 | What: IRQF_SAMPLE_RANDOM |
| 50 | Check: IRQF_SAMPLE_RANDOM | 39 | Check: IRQF_SAMPLE_RANDOM |
| 51 | When: July 2009 | 40 | When: July 2009 |