---

yaml
---
r: 305875
b: refs/heads/master
c: 62a9aeb
h: refs/heads/master
i:
  305873: 22e4962
  305871: fdfde20
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59d0952b43552570e0f1c3ff91ebb16d4caec171
+refs/heads/master: 62a9aebc5b8e28073a8609b9af6e8321cc622344

trunk/Documentation/ABI/testing/sysfs-devices-power

@@ -96,26 +96,16 @@ Description:
 		is read-only.  If the device is not enabled to wake up the
 		system from sleep states, this attribute is not present.
 
-What:		/sys/devices/.../power/wakeup_abort_count
-Date:		February 2012
+What:		/sys/devices/.../power/wakeup_hit_count
+Date:		September 2010
 Contact:	Rafael J. Wysocki <rjw@sisk.pl>
 Description:
-		The /sys/devices/.../wakeup_abort_count attribute contains the
+		The /sys/devices/.../wakeup_hit_count attribute contains the
 		number of times the processing of a wakeup event associated with
-		the device might have aborted system transition into a sleep
-		state in progress.  This attribute is read-only.  If the device
-		is not enabled to wake up the system from sleep states, this
-		attribute is not present.
-
-What:		/sys/devices/.../power/wakeup_expire_count
-Date:		February 2012
-Contact:	Rafael J. Wysocki <rjw@sisk.pl>
-Description:
-		The /sys/devices/.../wakeup_expire_count attribute contains the
-		number of times a wakeup event associated with the device has
-		been reported with a timeout that expired.  This attribute is
-		read-only.  If the device is not enabled to wake up the system
-		from sleep states, this attribute is not present.
+		the device might prevent the system from entering a sleep state.
+		This attribute is read-only.  If the device is not enabled to
+		wake up the system from sleep states, this attribute is not
+		present.
 
 What:		/sys/devices/.../power/wakeup_active
 Date:		September 2010
@@ -158,17 +148,6 @@ Description:
 		not enabled to wake up the system from sleep states, this
 		attribute is not present.
 
-What:		/sys/devices/.../power/wakeup_prevent_sleep_time_ms
-Date:		February 2012
-Contact:	Rafael J. Wysocki <rjw@sisk.pl>
-Description:
-		The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute
-		contains the total time the device has been preventing
-		opportunistic transitions to sleep states from occuring.
-		This attribute is read-only.  If the device is not enabled to
-		wake up the system from sleep states, this attribute is not
-		present.
-
 What:		/sys/devices/.../power/autosuspend_delay_ms
 Date:		September 2010
 Contact:	Alan Stern <stern@rowland.harvard.edu>

trunk/Documentation/ABI/testing/sysfs-power

@@ -172,62 +172,3 @@ Description:
 
 		Reading from this file will display the current value, which is
 		set to 1 MB by default.
-
-What:		/sys/power/autosleep
-Date:		April 2012
-Contact:	Rafael J. Wysocki <rjw@sisk.pl>
-Description:
-		The /sys/power/autosleep file can be written one of the strings
-		returned by reads from /sys/power/state.  If that happens, a
-		work item attempting to trigger a transition of the system to
-		the sleep state represented by that string is queued up.  This
-		attempt will only succeed if there are no active wakeup sources
-		in the system at that time.  After every execution, regardless
-		of whether or not the attempt to put the system to sleep has
-		succeeded, the work item requeues itself until user space
-		writes "off" to /sys/power/autosleep.
-
-		Reading from this file causes the last string successfully
-		written to it to be returned.
-
-What:		/sys/power/wake_lock
-Date:		February 2012
-Contact:	Rafael J. Wysocki <rjw@sisk.pl>
-Description:
-		The /sys/power/wake_lock file allows user space to create
-		wakeup source objects and activate them on demand (if one of
-		those wakeup sources is active, reads from the
-		/sys/power/wakeup_count file block or return false).  When a
-		string without white space is written to /sys/power/wake_lock,
-		it will be assumed to represent a wakeup source name.  If there
-		is a wakeup source object with that name, it will be activated
-		(unless active already).  Otherwise, a new wakeup source object
-		will be registered, assigned the given name and activated.
-		If a string written to /sys/power/wake_lock contains white
-		space, the part of the string preceding the white space will be
-		regarded as a wakeup source name and handled as descrived above.
-		The other part of the string will be regarded as a timeout (in
-		nanoseconds) such that the wakeup source will be automatically
-		deactivated after it has expired.  The timeout, if present, is
-		set regardless of the current state of the wakeup source object
-		in question.
-
-		Reads from this file return a string consisting of the names of
-		wakeup sources created with the help of it that are active at
-		the moment, separated with spaces.
-
-
-What:		/sys/power/wake_unlock
-Date:		February 2012
-Contact:	Rafael J. Wysocki <rjw@sisk.pl>
-Description:
-		The /sys/power/wake_unlock file allows user space to deactivate
-		wakeup sources created with the help of /sys/power/wake_lock.
-		When a string is written to /sys/power/wake_unlock, it will be
-		assumed to represent the name of a wakeup source to deactivate.
-		If a wakeup source object of that name exists and is active at
-		the moment, it will be deactivated.
-
-		Reads from this file return a string consisting of the names of
-		wakeup sources created with the help of /sys/power/wake_lock
-		that are inactive at the moment, separated with spaces.