---

yaml
---
r: 213529
b: refs/heads/master
c: f0ae849
h: refs/heads/master
i:
  213527: deda58a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73ecf3a6e3f0206bf56a0fefe3b3eda042fb7034
+refs/heads/master: f0ae849df1cd6b597130d890f2107ee31bf02c19

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

@@ -77,91 +77,3 @@ Description:
 		devices this attribute is set to "enabled" by bus type code or
 		device drivers and in that cases it should be safe to leave the
 		default value.
-
-What:		/sys/devices/.../power/wakeup_count
-Date:		September 2010
-Contact:	Rafael J. Wysocki <rjw@sisk.pl>
-Description:
-		The /sys/devices/.../wakeup_count attribute contains the number
-		of signaled wakeup events associated with the device.  This
-		attribute is read-only.  If the device is not enabled to wake up
-		the system from sleep states, this attribute is empty.
-
-What:		/sys/devices/.../power/wakeup_active_count
-Date:		September 2010
-Contact:	Rafael J. Wysocki <rjw@sisk.pl>
-Description:
-		The /sys/devices/.../wakeup_active_count attribute contains the
-		number of times the processing of wakeup events associated with
-		the device was completed (at the kernel level).  This attribute
-		is read-only.  If the device is not enabled to wake up the
-		system from sleep states, this attribute is empty.
-
-What:		/sys/devices/.../power/wakeup_hit_count
-Date:		September 2010
-Contact:	Rafael J. Wysocki <rjw@sisk.pl>
-Description:
-		The /sys/devices/.../wakeup_hit_count attribute contains the
-		number of times the processing of a wakeup event associated with
-		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 empty.
-
-What:		/sys/devices/.../power/wakeup_active
-Date:		September 2010
-Contact:	Rafael J. Wysocki <rjw@sisk.pl>
-Description:
-		The /sys/devices/.../wakeup_active attribute contains either 1,
-		or 0, depending on whether or not a wakeup event associated with
-		the device is being processed (1).  This attribute is read-only.
-		If the device is not enabled to wake up the system from sleep
-		states, this attribute is empty.
-
-What:		/sys/devices/.../power/wakeup_total_time_ms
-Date:		September 2010
-Contact:	Rafael J. Wysocki <rjw@sisk.pl>
-Description:
-		The /sys/devices/.../wakeup_total_time_ms attribute contains
-		the total time of processing wakeup events associated with the
-		device, in milliseconds.  This attribute is read-only.  If the
-		device is not enabled to wake up the system from sleep states,
-		this attribute is empty.
-
-What:		/sys/devices/.../power/wakeup_max_time_ms
-Date:		September 2010
-Contact:	Rafael J. Wysocki <rjw@sisk.pl>
-Description:
-		The /sys/devices/.../wakeup_max_time_ms attribute contains
-		the maximum time of processing a single wakeup event associated
-		with the device, in milliseconds.  This attribute is read-only.
-		If the device is not enabled to wake up the system from sleep
-		states, this attribute is empty.
-
-What:		/sys/devices/.../power/wakeup_last_time_ms
-Date:		September 2010
-Contact:	Rafael J. Wysocki <rjw@sisk.pl>
-Description:
-		The /sys/devices/.../wakeup_last_time_ms attribute contains
-		the value of the monotonic clock corresponding to the time of
-		signaling the last wakeup event associated with the device, in
-		milliseconds.  This attribute is read-only.  If the device is
-		not enabled to wake up the system from sleep states, this
-		attribute is empty.
-
-What:		/sys/devices/.../power/autosuspend_delay_ms
-Date:		September 2010
-Contact:	Alan Stern <stern@rowland.harvard.edu>
-Description:
-		The /sys/devices/.../power/autosuspend_delay_ms attribute
-		contains the autosuspend delay value (in milliseconds).  Some
-		drivers do not want their device to suspend as soon as it
-		becomes idle at run time; they want the device to remain
-		inactive for a certain minimum period of time first.  That
-		period is called the autosuspend delay.  Negative values will
-		prevent the device from being suspended at run time (similar
-		to writing "on" to the power/control attribute).  Values >=
-		1000 will cause the autosuspend timer expiration to be rounded
-		up to the nearest second.
-
-		Not all drivers support this attribute.  If it isn't supported,
-		attempts to read or write it will yield I/O errors.

trunk/Documentation/ABI/testing/sysfs-power

@@ -99,38 +99,9 @@ Description:
 
 		dmesg -s 1000000 | grep 'hash matches'
 
-		If you do not get any matches (or they appear to be false
-		positives), it is possible that the last PM event point
-		referred to a device created by a loadable kernel module.  In
-		this case cat /sys/power/pm_trace_dev_match (see below) after
-		your system is started up and the kernel modules are loaded.
-
 		CAUTION: Using it will cause your machine's real-time (CMOS)
 		clock to be set to a random invalid time after a resume.
 
-What;		/sys/power/pm_trace_dev_match
-Date:		October 2010
-Contact:	James Hogan <james@albanarts.com>
-Description:
-		The /sys/power/pm_trace_dev_match file contains the name of the
-		device associated with the last PM event point saved in the RTC
-		across reboots when pm_trace has been used.  More precisely it
-		contains the list of current devices (including those
-		registered by loadable kernel modules since boot) which match
-		the device hash in the RTC at boot, with a newline after each
-		one.
-
-		The advantage of this file over the hash matches printed to the
-		kernel log (see /sys/power/pm_trace), is that it includes
-		devices created after boot by loadable kernel modules.
-
-		Due to the small hash size necessary to fit in the RTC, it is
-		possible that more than one device matches the hash, in which
-		case further investigation is required to determine which
-		device is causing the problem.  Note that genuine RTC clock
-		values (such as when pm_trace has not been used), can still
-		match a device and output it's name here.
-
 What:		/sys/power/pm_async
 Date:		January 2009
 Contact:	Rafael J. Wysocki <rjw@sisk.pl>

trunk/Documentation/DocBook/drm.tmpl

@@ -136,7 +136,6 @@
 #ifdef CONFIG_COMPAT
 		.compat_ioctl = i915_compat_ioctl,
 #endif
-		.llseek = noop_llseek,
 		},
 	.pci_driver = {
 		.name = DRIVER_NAME,