Merge branch 'master' of

git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.33.y

Conflicts:
	Makefile
	arch/x86/kernel/apic/io_apic.c
	drivers/staging/mimio/mimio.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

2 files changed, 11 insertions, 0 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index e7848a0d99eb..e2c74872ab70 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2703,6 +2703,13 @@ and is between 256 and 4096 characters. It is defined in the file
                                         medium is write-protected).
                         Example: quirks=0419:aaf5:rl,0421:0433:rc
 
+        userpte=
+                        [X86] Flags controlling user PTE allocations.
+
+                                nohigh = do not allocate PTE pages in
+                                        HIGHMEM regardless of setting
+                                        of CONFIG_HIGHPTE.
+
         vdso=           [X86,SH]
                         vdso=2: enable compat VDSO (default with COMPAT_VDSO)
                         vdso=1: enable VDSO (default)
diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt
index 75afa1229fd7..39c0a09d0105 100644
--- a/Documentation/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
@@ -650,6 +650,10 @@ LCD, CRT or DVI (if available). The following commands are available:
         echo expand_toggle > /proc/acpi/ibm/video
         echo video_switch > /proc/acpi/ibm/video
 
+NOTE: Access to this feature is restricted to processes owning the
+CAP_SYS_ADMIN capability for safety reasons, as it can interact badly
+enough with some versions of X.org to crash it.
+
 Each video output device can be enabled or disabled individually.
 Reading /proc/acpi/ibm/video shows the status of each device.