diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-06 02:08:07 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-06 02:08:07 -0400 |
| commit | ea2aca084ba82aaf7c148d04914ceed8758ce08a (patch) | |
| tree | dcb3f4f849cf48deac2dd3bafd5c2cd2f0e7dc79 /Documentation/feature-removal-schedule.txt | |
| parent | f3032be921cd126615ce3bfd7084e3d319f3f892 (diff) | |
| parent | c5a78ac00c400df29645e59938700301efb371d0 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wan/hdlc_fr.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'Documentation/feature-removal-schedule.txt')
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 5378511a5f9f..8319c462c9f0 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
| @@ -324,3 +324,12 @@ Why: A newer version of the options have been introduced in 2005 that | |||
| 324 | space app that directly uses the old options should convert to using | 324 | space app that directly uses the old options should convert to using |
| 325 | the new options. | 325 | the new options. |
| 326 | Who: Vlad Yasevich <vladislav.yasevich@hp.com> | 326 | Who: Vlad Yasevich <vladislav.yasevich@hp.com> |
| 327 | |||
| 328 | --------------------------- | ||
| 329 | |||
| 330 | What: CONFIG_THERMAL_HWMON | ||
| 331 | When: January 2009 | ||
| 332 | Why: This option was introduced just to allow older lm-sensors userspace | ||
| 333 | to keep working over the upgrade to 2.6.26. At the scheduled time of | ||
| 334 | removal fixed lm-sensors (2.x or 3.x) should be readily available. | ||
| 335 | Who: Rene Herman <rene.herman@gmail.com> | ||