Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (112 commits)
  ACPI: fix build warning
  Revert "cpuidle: build fix for non-x86"
  ACPI: update intrd DSDT override console messages
  ACPI: update DSDT override documentation
  ACPI: Add "acpi_no_initrd_override" kernel parameter
  ACPI: its a directory not a folder....
  ACPI: misc cleanups
  ACPI: add missing prink prefix strings
  ACPI: cleanup acpi.h
  ACPICA: fix CONFIG_ACPI_DEBUG_FUNC_TRACE build
  ACPI: video: Ignore ACPI video devices that aren't present in hardware
  ACPI: video: reset brightness on resume
  ACPI: video: call ACPI notifier chain for ACPI video notifications
  ACPI: create notifier chain to get hotkey events to graphics driver
  ACPI: video: delete unused display switch on hotkey event code
  ACPI: video: create "brightness_switch_enabled" modparam
  cpuidle: Add a poll_idle method
  ACPI: cpuidle: Support C1 idle time accounting
  ACPI: enable MWAIT for C1 idle
  ACPI: idle: Fix acpi_safe_halt usages and interrupt enabling/disabling
  ...

9 files changed, 552 insertions, 10 deletions

diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index d273b557a934..6e9c4050a41b 100644
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -14,6 +14,7 @@ Following translations are available on the WWW:
         - this file.
 ABI/
         - info on kernel <-> userspace ABI and relative interface stability.
+
 BUG-HUNTING
         - brute force method of doing binary search of patches to find bug.
 Changes
@@ -66,6 +67,8 @@ VGA-softcursor.txt
         - how to change your VGA cursor from a blinking underscore.
 accounting/
         - documentation on accounting and taskstats.
+acpi/
+        - info on ACPI-specific hooks in the kernel.
 aoe/
         - description of AoE (ATA over Ethernet) along with config examples.
 applying-patches.txt
diff --git a/Documentation/ABI/testing/sysfs-firmware-acpi b/Documentation/ABI/testing/sysfs-firmware-acpi
new file mode 100644
index 000000000000..9470ed9afcc0
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-firmware-acpi
@@ -0,0 +1,99 @@
+What:           /sys/firmware/acpi/interrupts/
+Date:           February 2008
+Contact:        Len Brown <lenb@kernel.org>
+Description:
+                All ACPI interrupts are handled via a single IRQ,
+                the System Control Interrupt (SCI), which appears
+                as "acpi" in /proc/interrupts.
+
+                However, one of the main functions of ACPI is to make
+                the platform understand random hardware without
+                special driver support.  So while the SCI handles a few
+                well known (fixed feature) interrupts sources, such
+                as the power button, it can also handle a variable
+                number of a "General Purpose Events" (GPE).
+
+                A GPE vectors to a specified handler in AML, which
+                can do a anything the BIOS writer wants from
+                OS context.  GPE 0x12, for example, would vector
+                to a level or edge handler called _L12 or _E12.
+                The handler may do its business and return.
+                Or the handler may send send a Notify event
+                to a Linux device driver registered on an ACPI device,
+                such as a battery, or a processor.
+
+                To figure out where all the SCI's are coming from,
+                /sys/firmware/acpi/interrupts contains a file listing
+                every possible source, and the count of how many
+                times it has triggered.
+
+                $ cd /sys/firmware/acpi/interrupts
+                $ grep . *
+                error:0
+                ff_gbl_lock:0
+                ff_pmtimer:0
+                ff_pwr_btn:0
+                ff_rt_clk:0
+                ff_slp_btn:0
+                gpe00:0
+                gpe01:0
+                gpe02:0
+                gpe03:0
+                gpe04:0
+                gpe05:0
+                gpe06:0
+                gpe07:0
+                gpe08:0
+                gpe09:174
+                gpe0A:0
+                gpe0B:0
+                gpe0C:0
+                gpe0D:0
+                gpe0E:0
+                gpe0F:0
+                gpe10:0
+                gpe11:60
+                gpe12:0
+                gpe13:0
+                gpe14:0
+                gpe15:0
+                gpe16:0
+                gpe17:0
+                gpe18:0
+                gpe19:7
+                gpe1A:0
+                gpe1B:0
+                gpe1C:0
+                gpe1D:0
+                gpe1E:0
+                gpe1F:0
+                gpe_all:241
+                sci:241
+
+                sci - The total number of times the ACPI SCI
+                has claimed an interrupt.
+
+                gpe_all - count of SCI caused by GPEs.
+
+                gpeXX - count for individual GPE source
+
+                ff_gbl_lock - Global Lock
+
+                ff_pmtimer - PM Timer
+
+                ff_pwr_btn - Power Button
+
+                ff_rt_clk - Real Time Clock
+
+                ff_slp_btn - Sleep Button
+
+                error - an interrupt that can't be accounted for above.
+
+                Root has permission to clear any of these counters.  Eg.
+                # echo 0 > gpe11
+
+                All counters can be cleared by clearing the total "sci":
+                # echo 0 > sci
+
+                None of these counters has an effect on the function
+                of the system, they are simply statistics.
diff --git a/Documentation/acpi/dsdt-override.txt b/Documentation/acpi/dsdt-override.txt
new file mode 100644
index 000000000000..5008f256a2db
--- /dev/null
+++ b/Documentation/acpi/dsdt-override.txt
@@ -0,0 +1,15 @@
+Linux supports two methods of overriding the BIOS DSDT:
+
+CONFIG_ACPI_CUSTOM_DSDT builds the image into the kernel.
+
+CONFIG_ACPI_CUSTOM_DSDT_INITRD adds the image to the initrd.
+
+When to use these methods is described in detail on the
+Linux/ACPI home page:
+http://www.lesswatts.org/projects/acpi/overridingDSDT.php
+
+Note that if both options are used, the DSDT supplied
+by the INITRD method takes precedence.
+
+Documentation/initramfs-add-dsdt.sh is provided for convenience
+for use with the CONFIG_ACPI_CUSTOM_DSDT_INITRD method.
diff --git a/Documentation/acpi/initramfs-add-dsdt.sh b/Documentation/acpi/initramfs-add-dsdt.sh
new file mode 100755
index 000000000000..17ef6e838e14
--- /dev/null
+++ b/Documentation/acpi/initramfs-add-dsdt.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+# Adds a DSDT file to the initrd (if it's an initramfs)
+# first argument is the name of archive
+# second argument is the name of the file to add
+# The file will be copied as /DSDT.aml
+
+# 20060126: fix "Premature end of file" with some old cpio (Roland Robic)
+# 20060205: this time it should really work
+
+# check the arguments
+if [ $# -ne 2 ]; then
+        program_name=$(basename $0)
+        echo "\
+$program_name: too few arguments
+Usage: $program_name initrd-name.img DSDT-to-add.aml
+Adds a DSDT file to an initrd (in initramfs format)
+
+  initrd-name.img: filename of the initrd in initramfs format
+  DSDT-to-add.aml: filename of the DSDT file to add
+  " 1>&2
+    exit 1
+fi
+
+# we should check it's an initramfs
+
+tempcpio=$(mktemp -d)
+# cleanup on exit, hangup, interrupt, quit, termination
+trap 'rm -rf $tempcpio' 0 1 2 3 15
+
+# extract the archive
+gunzip -c "$1" > "$tempcpio"/initramfs.cpio || exit 1
+
+# copy the DSDT file at the root of the directory so that we can call it "/DSDT.aml"
+cp -f "$2" "$tempcpio"/DSDT.aml
+
+# add the file
+cd "$tempcpio"
+(echo DSDT.aml | cpio --quiet -H newc -o -A -O "$tempcpio"/initramfs.cpio) || exit 1
+cd "$OLDPWD"
+
+# re-compress the archive
+gzip -c "$tempcpio"/initramfs.cpio > "$1"
+
diff --git a/Documentation/acpi/method-tracing.txt b/Documentation/acpi/method-tracing.txt
new file mode 100644
index 000000000000..f6efb1ea559a
--- /dev/null
+++ b/Documentation/acpi/method-tracing.txt
@@ -0,0 +1,26 @@
+/sys/module/acpi/parameters/:
+
+trace_method_name
+        The AML method name that the user wants to trace
+
+trace_debug_layer
+        The temporary debug_layer used when tracing the method.
+        Using 0xffffffff by default if it is 0.
+
+trace_debug_level
+        The temporary debug_level used when tracing the method.
+        Using 0x00ffffff by default if it is 0.
+
+trace_state
+        The status of the tracing feature.
+
+        "enabled" means this feature is enabled
+        and the AML method is traced every time it's executed.
+
+        "1" means this feature is enabled and the AML method
+        will only be traced during the next execution.
+
+        "disabled" means this feature is disabled.
+        Users can enable/disable this debug tracing feature by
+        "echo string > /sys/module/acpi/parameters/trace_state".
+        "string" should be one of "enable", "disable" and "1".
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 8fd5aa40585f..0dcbd266b442 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -147,8 +147,10 @@ and is between 256 and 4096 characters. It is defined in the file
                         default: 0
 
         acpi_sleep=     [HW,ACPI] Sleep options
-                        Format: { s3_bios, s3_mode }
-                        See Documentation/power/video.txt
+                        Format: { s3_bios, s3_mode, s3_beep }
+                        See Documentation/power/video.txt for s3_bios and s3_mode.
+                        s3_beep is for debugging; it makes the PC's speaker beep
+                        as soon as the kernel's real-mode entry point is called.
 
         acpi_sci=       [HW,ACPI] ACPI System Control Interrupt trigger mode
                         Format: { level | edge | high | low }
@@ -175,6 +177,9 @@ and is between 256 and 4096 characters. It is defined in the file
 
         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"
 
diff --git a/Documentation/power/swsusp.txt b/Documentation/power/swsusp.txt
index aea7e9209667..9d60ab717a7b 100644
--- a/Documentation/power/swsusp.txt
+++ b/Documentation/power/swsusp.txt
@@ -386,6 +386,11 @@ before suspending; then remount them after resuming.
 There is a work-around for this problem.  For more information, see
 Documentation/usb/persist.txt.
 
+Q: Can I suspend-to-disk using a swap partition under LVM?
+
+A: No. You can suspend successfully, but you'll not be able to
+resume. uswsusp should be able to work with LVM. See suspend.sf.net.
+
 Q: I upgraded the kernel from 2.6.15 to 2.6.16. Both kernels were
 compiled with the similar configuration files. Anyway I found that
 suspend to disk (and resume) is much slower on 2.6.16 compared to
diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt
new file mode 100644
index 000000000000..5776e090359d
--- /dev/null
+++ b/Documentation/thermal/sysfs-api.txt
@@ -0,0 +1,246 @@
+Generic Thermal Sysfs driver How To
+=========================
+
+Written by Sujith Thomas <sujith.thomas@intel.com>, Zhang Rui <rui.zhang@intel.com>
+
+Updated: 2 January 2008
+
+Copyright (c)  2008 Intel Corporation
+
+
+0. Introduction
+
+The generic thermal sysfs provides a set of interfaces for thermal zone devices (sensors)
+and thermal cooling devices (fan, processor...) to register with the thermal management
+solution and to be a part of it.
+
+This how-to focusses on enabling new thermal zone and cooling devices to participate
+in thermal management.
+This solution is platform independent and any type of thermal zone devices and
+cooling devices should be able to make use of the infrastructure.
+
+The main task of the thermal sysfs driver is to expose thermal zone attributes as well
+as cooling device attributes to the user space.
+An intelligent thermal management application can make decisions based on inputs
+from thermal zone attributes (the current temperature and trip point temperature)
+and throttle appropriate devices.
+
+[0-*]   denotes any positive number starting from 0
+[1-*]   denotes any positive number starting from 1
+
+1. thermal sysfs driver interface functions
+
+1.1 thermal zone device interface
+1.1.1 struct thermal_zone_device *thermal_zone_device_register(char *name, int trips,
+                                void *devdata, struct thermal_zone_device_ops *ops)
+
+        This interface function adds a new thermal zone device (sensor) to
+        /sys/class/thermal folder as thermal_zone[0-*].
+        It tries to bind all the thermal cooling devices registered at the same time.
+
+        name: the thermal zone name.
+        trips: the total number of trip points this thermal zone supports.
+        devdata: device private data
+        ops: thermal zone device callbacks.
+                .bind: bind the thermal zone device with a thermal cooling device.
+                .unbind: unbing the thermal zone device with a thermal cooling device.
+                .get_temp: get the current temperature of the thermal zone.
+                .get_mode: get the current mode (user/kernel) of the thermal zone.
+                           "kernel" means thermal management is done in kernel.
+                           "user" will prevent kernel thermal driver actions upon trip points
+                           so that user applications can take charge of thermal management.
+                .set_mode: set the mode (user/kernel) of the thermal zone.
+                .get_trip_type: get the type of certain trip point.
+                .get_trip_temp: get the temperature above which the certain trip point
+                                will be fired.
+
+1.1.2 void thermal_zone_device_unregister(struct thermal_zone_device *tz)
+
+        This interface function removes the thermal zone device.
+        It deletes the corresponding entry form /sys/class/thermal folder and unbind all
+        the thermal cooling devices it uses.
+
+1.2 thermal cooling device interface
+1.2.1 struct thermal_cooling_device *thermal_cooling_device_register(char *name,
+                                        void *devdata, struct thermal_cooling_device_ops *)
+
+        This interface function adds a new thermal cooling device (fan/processor/...) to
+        /sys/class/thermal/ folder as cooling_device[0-*].
+        It tries to bind itself to all the thermal zone devices register at the same time.
+        name: the cooling device name.
+        devdata: device private data.
+        ops: thermal cooling devices callbacks.
+                .get_max_state: get the Maximum throttle state of the cooling device.
+                .get_cur_state: get the Current throttle state of the cooling device.
+                .set_cur_state: set the Current throttle state of the cooling device.
+
+1.2.2 void thermal_cooling_device_unregister(struct thermal_cooling_device *cdev)
+
+        This interface function remove the thermal cooling device.
+        It deletes the corresponding entry form /sys/class/thermal folder and unbind
+        itself from all the thermal zone devices using it.
+
+1.3 interface for binding a thermal zone device with a thermal cooling device
+1.3.1 int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
+                        int trip, struct thermal_cooling_device *cdev);
+
+        This interface function bind a thermal cooling device to the certain trip point
+        of a thermal zone device.
+        This function is usually called in the thermal zone device .bind callback.
+        tz: the thermal zone device
+        cdev: thermal cooling device
+        trip: indicates which trip point the cooling devices is associated with
+                 in this thermal zone.
+
+1.3.2 int thermal_zone_unbind_cooling_device(struct thermal_zone_device *tz,
+                                int trip, struct thermal_cooling_device *cdev);
+
+        This interface function unbind a thermal cooling device from the certain trip point
+        of a thermal zone device.
+        This function is usually called in the thermal zone device .unbind callback.
+        tz: the thermal zone device
+        cdev: thermal cooling device
+        trip: indicates which trip point the cooling devices is associated with
+                in this thermal zone.
+
+2. sysfs attributes structure
+
+RO      read only value
+RW      read/write value
+
+All thermal sysfs attributes will be represented under /sys/class/thermal
+/sys/class/thermal/
+
+Thermal zone device sys I/F, created once it's registered:
+|thermal_zone[0-*]:
+        |-----type:                     Type of the thermal zone
+        |-----temp:                     Current temperature
+        |-----mode:                     Working mode of the thermal zone
+        |-----trip_point_[0-*]_temp:    Trip point temperature
+        |-----trip_point_[0-*]_type:    Trip point type
+
+Thermal cooling device sys I/F, created once it's registered:
+|cooling_device[0-*]:
+        |-----type :                    Type of the cooling device(processor/fan/...)
+        |-----max_state:                Maximum cooling state of the cooling device
+        |-----cur_state:                Current cooling state of the cooling device
+
+
+These two dynamic attributes are created/removed in pairs.
+They represent the relationship between a thermal zone and its associated cooling device.
+They are created/removed for each
+thermal_zone_bind_cooling_device/thermal_zone_unbind_cooling_device successful exection.
+
+|thermal_zone[0-*]
+        |-----cdev[0-*]:                The [0-*]th cooling device in the current thermal zone
+        |-----cdev[0-*]_trip_point:     Trip point that cdev[0-*] is associated with
+
+
+***************************
+* Thermal zone attributes *
+***************************
+
+type                            Strings which represent the thermal zone type.
+                                This is given by thermal zone driver as part of registration.
+                                Eg: "ACPI thermal zone" indicates it's a ACPI thermal device
+                                RO
+                                Optional
+
+temp                            Current temperature as reported by thermal zone (sensor)
+                                Unit: degree celsius
+                                RO
+                                Required
+
+mode                            One of the predifned values in [kernel, user]
+                                This file gives information about the algorithm
+                                that is currently managing the thermal zone.
+                                It can be either default kernel based algorithm
+                                or user space application.
+                                RW
+                                Optional
+                                kernel  = Thermal management in kernel thermal zone driver.
+                                user    = Preventing kernel thermal zone driver actions upon
+                                          trip points so that user application can take full
+                                          charge of the thermal management.
+
+trip_point_[0-*]_temp           The temperature above which trip point will be fired
+                                Unit: degree celsius
+                                RO
+                                Optional
+
+trip_point_[0-*]_type           Strings which indicate the type of the trip point
+                                Eg. it can be one of critical, hot, passive,
+                                    active[0-*] for ACPI thermal zone.
+                                RO
+                                Optional
+
+cdev[0-*]                       Sysfs link to the thermal cooling device node where the sys I/F
+                                for cooling device throttling control represents.
+                                RO
+                                Optional
+
+cdev[0-*]_trip_point            The trip point with which cdev[0-*] is assocated in this thermal zone
+                                -1 means the cooling device is not associated with any trip point.
+                                RO
+                                Optional
+
+******************************
+* Cooling device  attributes *
+******************************
+
+type                            String which represents the type of device
+                                eg: For generic ACPI: this should be "Fan",
+                                "Processor" or "LCD"
+                                eg. For memory controller device on intel_menlow platform:
+                                this should be "Memory controller"
+                                RO
+                                Optional
+
+max_state                       The maximum permissible cooling state of this cooling device.
+                                RO
+                                Required
+
+cur_state                       The current cooling state of this cooling device.
+                                the value can any integer numbers between 0 and max_state,
+                                cur_state == 0 means no cooling
+                                cur_state == max_state means the maximum cooling.
+                                RW
+                                Required
+
+3. A simple implementation
+
+ACPI thermal zone may support multiple trip points like critical/hot/passive/active.
+If an ACPI thermal zone supports critical, passive, active[0] and active[1] at the same time,
+it may register itself as a thermale_zone_device (thermal_zone1) with 4 trip points in all.
+It has one processor and one fan, which are both registered as thermal_cooling_device.
+If the processor is listed in _PSL method, and the fan is listed in _AL0 method,
+the sys I/F structure will be built like this:
+
+/sys/class/thermal:
+
+|thermal_zone1:
+        |-----type:                     ACPI thermal zone
+        |-----temp:                     37
+        |-----mode:                     kernel
+        |-----trip_point_0_temp:        100
+        |-----trip_point_0_type:        critical
+        |-----trip_point_1_temp:        80
+        |-----trip_point_1_type:        passive
+        |-----trip_point_2_temp:        70
+        |-----trip_point_2_type:        active[0]
+        |-----trip_point_3_temp:        60
+        |-----trip_point_3_type:        active[1]
+        |-----cdev0:                    --->/sys/class/thermal/cooling_device0
+        |-----cdev0_trip_point:         1       /* cdev0 can be used for passive */
+        |-----cdev1:                    --->/sys/class/thermal/cooling_device3
+        |-----cdev1_trip_point:         2       /* cdev1 can be used for active[0]*/
+
+|cooling_device0:
+        |-----type:                     Processor
+        |-----max_state:                8
+        |-----cur_state:                0
+
+|cooling_device3:
+        |-----type:                     Fan
+        |-----max_state:                2
+        |-----cur_state:                0
diff --git a/Documentation/thinkpad-acpi.txt b/Documentation/thinkpad-acpi.txt
index 10c041ca13c7..6c2477754a2a 100644
--- a/Documentation/thinkpad-acpi.txt
+++ b/Documentation/thinkpad-acpi.txt
@@ -1,7 +1,7 @@
                      ThinkPad ACPI Extras Driver
 
-                            Version 0.17
-                         October 04th, 2007
+                            Version 0.19
+                         January 06th, 2008
 
                Borislav Deianov <borislav@users.sf.net>
              Henrique de Moraes Holschuh <hmh@hmh.eng.br>
@@ -215,6 +215,11 @@ The following commands can be written to the /proc/acpi/ibm/hotkey file:
         ... any other 8-hex-digit mask ...
         echo reset > /proc/acpi/ibm/hotkey -- restore the original mask
 
+The procfs interface does not support NVRAM polling control.  So as to
+maintain maximum bug-to-bug compatibility, it does not report any masks,
+nor does it allow one to manipulate the hot key mask when the firmware
+does not support masks at all, even if NVRAM polling is in use.
+
 sysfs notes:
 
         hotkey_bios_enabled:
@@ -231,17 +236,26 @@ sysfs notes:
                 to this value.
 
         hotkey_enable:
-                Enables/disables the hot keys feature, and reports
-                current status of the hot keys feature.
+                Enables/disables the hot keys feature in the ACPI
+                firmware, and reports current status of the hot keys
+                feature.  Has no effect on the NVRAM hot key polling
+                functionality.
 
                 0: disables the hot keys feature / feature disabled
                 1: enables the hot keys feature / feature enabled
 
         hotkey_mask:
-                bit mask to enable driver-handling and ACPI event
-                generation for each hot key (see above).  Returns the
-                current status of the hot keys mask, and allows one to
-                modify it.
+                bit mask to enable driver-handling (and depending on
+                the firmware, ACPI event generation) for each hot key
+                (see above).  Returns the current status of the hot keys
+                mask, and allows one to modify it.
+
+                Note: when NVRAM polling is active, the firmware mask
+                will be different from the value returned by
+                hotkey_mask.  The driver will retain enabled bits for
+                hotkeys that are under NVRAM polling even if the
+                firmware refuses them, and will not set these bits on
+                the firmware hot key mask.
 
         hotkey_all_mask:
                 bit mask that should enable event reporting for all
@@ -257,12 +271,48 @@ sysfs notes:
                 handled by the firmware anyway.  Echo it to
                 hotkey_mask above, to use.
 
+        hotkey_source_mask:
+                bit mask that selects which hot keys will the driver
+                poll the NVRAM for.  This is auto-detected by the driver
+                based on the capabilities reported by the ACPI firmware,
+                but it can be overridden at runtime.
+
+                Hot keys whose bits are set in both hotkey_source_mask
+                and also on hotkey_mask are polled for in NVRAM.  Only a
+                few hot keys are available through CMOS NVRAM polling.
+
+                Warning: when in NVRAM mode, the volume up/down/mute
+                keys are synthesized according to changes in the mixer,
+                so you have to use volume up or volume down to unmute,
+                as per the ThinkPad volume mixer user interface.  When
+                in ACPI event mode, volume up/down/mute are reported as
+                separate events, but this behaviour may be corrected in
+                future releases of this driver, in which case the
+                ThinkPad volume mixer user interface semanthics will be
+                enforced.
+
+        hotkey_poll_freq:
+                frequency in Hz for hot key polling. It must be between
+                0 and 25 Hz.  Polling is only carried out when strictly
+                needed.
+
+                Setting hotkey_poll_freq to zero disables polling, and
+                will cause hot key presses that require NVRAM polling
+                to never be reported.
+
+                Setting hotkey_poll_freq too low will cause repeated
+                pressings of the same hot key to be misreported as a
+                single key press, or to not even be detected at all.
+                The recommended polling frequency is 10Hz.
+
         hotkey_radio_sw:
                 if the ThinkPad has a hardware radio switch, this
                 attribute will read 0 if the switch is in the "radios
                 disabled" postition, and 1 if the switch is in the
                 "radios enabled" position.
 
+                This attribute has poll()/select() support.
+
         hotkey_report_mode:
                 Returns the state of the procfs ACPI event report mode
                 filter for hot keys.  If it is set to 1 (the default),
@@ -277,6 +327,25 @@ sysfs notes:
                 May return -EPERM (write access locked out by module
                 parameter) or -EACCES (read-only).
 
+        wakeup_reason:
+                Set to 1 if the system is waking up because the user
+                requested a bay ejection.  Set to 2 if the system is
+                waking up because the user requested the system to
+                undock.  Set to zero for normal wake-ups or wake-ups
+                due to unknown reasons.
+
+                This attribute has poll()/select() support.
+
+        wakeup_hotunplug_complete:
+                Set to 1 if the system was waken up because of an
+                undock or bay ejection request, and that request
+                was sucessfully completed.  At this point, it might
+                be useful to send the system back to sleep, at the
+                user's choice.  Refer to HKEY events 0x4003 and
+                0x3003, below.
+
+                This attribute has poll()/select() support.
+
 input layer notes:
 
 A Hot key is mapped to a single input layer EV_KEY event, possibly
@@ -427,6 +496,23 @@ Non hot-key ACPI HKEY event map:
 The above events are not propagated by the driver, except for legacy
 compatibility purposes when hotkey_report_mode is set to 1.
 
+0x2304          System is waking up from suspend to undock
+0x2305          System is waking up from suspend to eject bay
+0x2404          System is waking up from hibernation to undock
+0x2405          System is waking up from hibernation to eject bay
+
+The above events are never propagated by the driver.
+
+0x3003          Bay ejection (see 0x2x05) complete, can sleep again
+0x4003          Undocked (see 0x2x04), can sleep again
+0x5009          Tablet swivel: switched to tablet mode
+0x500A          Tablet swivel: switched to normal mode
+0x500B          Tablet pen insterted into its storage bay
+0x500C          Tablet pen removed from its storage bay
+0x5010          Brightness level changed (newer Lenovo BIOSes)
+
+The above events are propagated by the driver.
+
 Compatibility notes:
 
 ibm-acpi and thinkpad-acpi 0.15 (mainline kernels before 2.6.23) never
@@ -1263,3 +1349,17 @@ Sysfs interface changelog:
                 and the hwmon class for libsensors4 (lm-sensors 3)
                 compatibility.  Moved all hwmon attributes to this
                 new platform device.
+
+0x020100:       Marker for thinkpad-acpi with hot key NVRAM polling
+                support.  If you must, use it to know you should not
+                start an userspace NVRAM poller (allows to detect when
+                NVRAM is compiled out by the user because it is
+                unneeded/undesired in the first place).
+0x020101:       Marker for thinkpad-acpi with hot key NVRAM polling
+                and proper hotkey_mask semanthics (version 8 of the
+                NVRAM polling patch).  Some development snapshots of
+                0.18 had an earlier version that did strange things
+                to hotkey_mask.
+
+0x020200:       Add poll()/select() support to the following attributes:
+                hotkey_radio_sw, wakeup_hotunplug_complete, wakeup_reason