Merge branch 'linus' into core/urgent

Update with Linus tree so fixes for the same can be applied.

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

1 files changed, 13 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-devices-power_resources_wakeup b/Documentation/ABI/testing/sysfs-devices-power_resources_wakeup
new file mode 100644
index 000000000000..e0588feeb6e1
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-devices-power_resources_wakeup
@@ -0,0 +1,13 @@
+What:           /sys/devices/.../power_resources_wakeup/
+Date:           April 2013
+Contact:        Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Description:
+                The /sys/devices/.../power_resources_wakeup/ directory is only
+                present for device objects representing ACPI device nodes that
+                require ACPI power resources for wakeup signaling.
+
+                If present, it contains symbolic links to device directories
+                representing ACPI power resources that need to be turned on for
+                the given device node to be able to signal wakeup.  The names of
+                the links are the same as the names of the directories they
+                point to.