2 files changed, 1 insertions, 12 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 6fdb837d940b..71f0fea1058f 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -445,16 +445,6 @@ Who:	Jan Kiszka <jan.kiszka@web.de>
 
 ----------------------------
 
-What:   xtime, wall_to_monotonic
-When:   2.6.36+
-Files:  kernel/time/timekeeping.c include/linux/time.h
-Why:    Cleaning up timekeeping internal values. Please use
-        existing timekeeping accessor functions to access
-        the equivalent functionality.
-Who:    John Stultz <johnstul@us.ibm.com>
-
-----------------------------
-
 What:   KVM paravirt mmu host support
 When:   January 2011
 Why:    The paravirt mmu host support is slower than non-paravirt mmu, both
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index cbd405930522..71d286307cae 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -73,7 +73,6 @@ parameter is applicable:
         MTD     MTD (Memory Technology Device) support is enabled.
         NET     Appropriate network support is enabled.
         NUMA    NUMA support is enabled.
-        GENERIC_TIME The generic timeofday code is enabled.
         NFS     Appropriate NFS support is enabled.
         OSS     OSS sound support is enabled.
         PV_OPS  A paravirtualized kernel is enabled.
@@ -470,7 +469,7 @@ and is between 256 and 4096 characters. It is defined in the file
                         clocksource is not available, it defaults to PIT.
                         Format: { pit | tsc | cyclone | pmtmr }
 
-        clocksource=    [GENERIC_TIME] Override the default clocksource
+        clocksource=    Override the default clocksource
                         Format: <string>
                         Override the default clocksource and use the clocksource
                         with the name specified.