Merge branch 'shmobile' into devel

4 files changed, 13 insertions, 4 deletions

diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index dd10b51b4e65..5405f7aecefc 100644
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -32,8 +32,6 @@ DocBook/
         - directory with DocBook templates etc. for kernel documentation.
 HOWTO
         - the process and procedures of how to do Linux kernel development.
-IO-mapping.txt
-        - how to access I/O mapped memory from within device drivers.
 IPMI.txt
         - info on Linux Intelligent Platform Management Interface (IPMI) Driver.
 IRQ-affinity.txt
@@ -84,6 +82,8 @@ blockdev/
         - info on block devices & drivers
 btmrvl.txt
         - info on Marvell Bluetooth driver usage.
+bus-virt-phys-mapping.txt
+        - how to access I/O mapped memory from within device drivers.
 cachetlb.txt
         - describes the cache/TLB flushing interfaces Linux uses.
 cdrom/
@@ -168,6 +168,8 @@ initrd.txt
         - how to use the RAM disk as an initial/temporary root filesystem.
 input/
         - info on Linux input device support.
+io-mapping.txt
+        - description of io_mapping functions in linux/io-mapping.h
 io_ordering.txt
         - info on ordering I/O writes to memory-mapped addresses.
 ioctl/
diff --git a/Documentation/IO-mapping.txt b/Documentation/bus-virt-phys-mapping.txt
index 1b5aa10df845..1b5aa10df845 100644
--- a/Documentation/IO-mapping.txt
+++ b/Documentation/bus-virt-phys-mapping.txt
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index c268783bc4e7..1571c0c83dba 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -647,3 +647,10 @@ Who:	Stefan Richter <stefanr@s5r6.in-berlin.de>
 
 ----------------------------
 
+What:   The acpi_sleep=s4_nonvs command line option
+When:   2.6.37
+Files:  arch/x86/kernel/acpi/sleep.c
+Why:    superseded by acpi_sleep=nonvs
+Who:    Rafael J. Wysocki <rjw@sisk.pl>
+
+----------------------------
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 4ddb58df081e..2b2407d9a6d0 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -254,8 +254,8 @@ and is between 256 and 4096 characters. It is defined in the file
                         control method, with respect to putting devices into
                         low power states, to be enforced (the ACPI 2.0 ordering
                         of _PTS is used by default).
-                        s4_nonvs prevents the kernel from saving/restoring the
-                        ACPI NVS memory during hibernation.
+                        nonvs prevents the kernel from saving/restoring the
+                        ACPI NVS memory during suspend/hibernation and resume.
                         sci_force_enable causes the kernel to set SCI_EN directly
                         on resume from S1/S3 (which is against the ACPI spec,
                         but some broken systems don't work without it).