diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
| commit | 08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6 (patch) | |
| tree | 2be39bf8942edca1bcec735145e144a682ca9cd3 /Documentation/feature-removal-schedule.txt | |
| parent | f0de70f8bb56952f6e016a65a8a8d006918f5bf6 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wimax/i2400m/usb-notif.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 ac98851f7a0c..802c6fd20c63 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
| @@ -337,3 +337,12 @@ Why: In 2.6.18 the Secmark concept was introduced to replace the "compat_net" | |||
| 337 | Secmark, it is time to deprecate the older mechanism and start the | 337 | Secmark, it is time to deprecate the older mechanism and start the |
| 338 | process of removing the old code. | 338 | process of removing the old code. |
| 339 | Who: Paul Moore <paul.moore@hp.com> | 339 | Who: Paul Moore <paul.moore@hp.com> |
| 340 | --------------------------- | ||
| 341 | |||
| 342 | What: sysfs ui for changing p4-clockmod parameters | ||
| 343 | When: September 2009 | ||
| 344 | Why: See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and | ||
| 345 | e088e4c9cdb618675874becb91b2fd581ee707e6. | ||
| 346 | Removal is subject to fixing any remaining bugs in ACPI which may | ||
| 347 | cause the thermal throttling not to happen at the right time. | ||
| 348 | Who: Dave Jones <davej@redhat.com>, Matthew Garrett <mjg@redhat.com> | ||