Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Mar 2008 14:46:19 +0000 (07:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Mar 2008 14:46:19 +0000 (07:46 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: ALPS - fix forward/back buttons reversed on Acer 5520-5290
  Input: ALPS - put secondary device in proper place in sysfs
  Input: wacom - add support for Bamboo1, BambooFun, and Cintiq 12WX
  Input: document i8042.noloop
  Input: add keyboard notifier documentation
  Input: ads7846 - fix uninitialized var warning
  Input: i8042 - add SNI RM support
  Input: i8042 - add Lenovo 3000 N100 to nomux blacklist
  Input: i8042 - fix warning on non-x86 builds
  Input: cobalt_btns - assorted fixes

1  2 
Documentation/kernel-parameters.txt

index 622f7849edb968024f6879927aa7c6a2e008f695,09118a04594287b5cd8040d1a6192f94fcc4ba75..650b0d8aa89b7bde17ca17c1ee54ad37e57f7480
@@@ -138,7 -138,7 +138,7 @@@ and is between 256 and 4096 characters
                        strict -- Be less tolerant of platforms that are not
                                strictly ACPI specification compliant.
  
 -                      See also Documentation/pm.txt, pci=noacpi
 +                      See also Documentation/power/pm.txt, pci=noacpi
  
        acpi_apic_instance=     [ACPI, IOAPIC]
                        Format: <int>
  
        acpi_no_auto_ssdt       [HW,ACPI] Disable automatic loading of SSDT
  
 -      acpi_no_initrd_override [KNL,ACPI]
 -                      Disable loading custom ACPI tables from the initramfs
 -
        acpi_os_name=   [HW,ACPI] Tell ACPI BIOS the name of the OS
                        Format: To spoof as Windows 98: ="Microsoft Windows"
  
                             (Don't attempt to blink the leds)
        i8042.noaux     [HW] Don't check for auxiliary (== mouse) port
        i8042.nokbd     [HW] Don't check/create keyboard port
+       i8042.noloop    [HW] Disable the AUX Loopback command while probing
+                            for the AUX port
        i8042.nomux     [HW] Don't check presence of an active multiplexing
                             controller
        i8042.nopnp     [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX