aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/feature-removal-schedule.txt9
-rw-r--r--Documentation/x86/boot.txt2
2 files changed, 1 insertions, 10 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index b1c921c27519..951143dd0684 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -310,15 +310,6 @@ Who: Ravikiran Thirumalai <kiran@scalex86.org>
310 310
311--------------------------- 311---------------------------
312 312
313What: CONFIG_THERMAL_HWMON
314When: January 2009
315Why: This option was introduced just to allow older lm-sensors userspace
316 to keep working over the upgrade to 2.6.26. At the scheduled time of
317 removal fixed lm-sensors (2.x or 3.x) should be readily available.
318Who: Rene Herman <rene.herman@gmail.com>
319
320---------------------------
321
322What: Code that is now under CONFIG_WIRELESS_EXT_SYSFS 313What: Code that is now under CONFIG_WIRELESS_EXT_SYSFS
323 (in net/core/net-sysfs.c) 314 (in net/core/net-sysfs.c)
324When: After the only user (hal) has seen a release with the patches 315When: After the only user (hal) has seen a release with the patches
diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt
index 9b7221a86df2..7c3a8801b7ce 100644
--- a/Documentation/x86/boot.txt
+++ b/Documentation/x86/boot.txt
@@ -674,7 +674,7 @@ Protocol: 2.10+
674 674
675Field name: init_size 675Field name: init_size
676Type: read 676Type: read
677Offset/size: 0x25c/4 677Offset/size: 0x260/4
678 678
679 This field indicates the amount of linear contiguous memory starting 679 This field indicates the amount of linear contiguous memory starting
680 at the kernel runtime start address that the kernel needs before it 680 at the kernel runtime start address that the kernel needs before it