3 files changed, 18 insertions, 5 deletions

diff --git a/Documentation/arm/Samsung-S3C24XX/Suspend.txt b/Documentation/arm/Samsung-S3C24XX/Suspend.txt
index 0dab6e32c13..a30fe510572 100644
--- a/Documentation/arm/Samsung-S3C24XX/Suspend.txt
+++ b/Documentation/arm/Samsung-S3C24XX/Suspend.txt
@@ -40,13 +40,13 @@ Resuming
 Machine Support
 ---------------
 
-  The machine specific functions must call the s3c2410_pm_init() function
+  The machine specific functions must call the s3c_pm_init() function
   to say that its bootloader is capable of resuming. This can be as
   simple as adding the following to the machine's definition:
 
-  INITMACHINE(s3c2410_pm_init)
+  INITMACHINE(s3c_pm_init)
 
-  A board can do its own setup before calling s3c2410_pm_init, if it
+  A board can do its own setup before calling s3c_pm_init, if it
   needs to setup anything else for power management support.
 
   There is currently no support for over-riding the default method of
@@ -74,7 +74,7 @@ statuc void __init machine_init(void)
 
         enable_irq_wake(IRQ_EINT0);
 
-        s3c2410_pm_init();
+        s3c_pm_init();
 }
 
 
diff --git a/Documentation/arm/memory.txt b/Documentation/arm/memory.txt
index dc6045577a8..43cb1004d35 100644
--- a/Documentation/arm/memory.txt
+++ b/Documentation/arm/memory.txt
@@ -29,7 +29,14 @@ ffff0000	ffff0fff	CPU vector page.
                                 CPU supports vector relocation (control
                                 register V bit.)
 
-ffc00000        fffeffff        DMA memory mapping region.  Memory returned
+fffe0000        fffeffff        XScale cache flush area.  This is used
+                                in proc-xscale.S to flush the whole data
+                                cache.  Free for other usage on non-XScale.
+
+fff00000        fffdffff        Fixmap mapping region.  Addresses provided
+                                by fix_to_virt() will be located here.
+
+ffc00000        ffefffff        DMA memory mapping region.  Memory returned
                                 by the dma_alloc_xxx functions will be
                                 dynamically mapped here.
 
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 6b979d1d09a..d1e2fcb6298 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -836,6 +836,12 @@ and is between 256 and 4096 characters. It is defined in the file
                                If specified, z/VM IUCV HVC accepts connections
                                from listed z/VM user IDs only.
 
+        i2c_bus=        [HW] Override the default board specific I2C bus speed
+                             or register an additional I2C bus that is not
+                             registered from board initialization code.
+                             Format:
+                             <bus_id>,<clkrate>
+
         i8042.debug     [HW] Toggle i8042 debug mode
         i8042.direct    [HW] Put keyboard port into non-translated mode
         i8042.dumbkbd   [HW] Pretend that controller can only read data from