Skip to content

Commit b41fb43

Browse files
linuswlinusw
committed
Merge tag 'v3.12-rc6' into devel
Linux 3.12-rc6 Conflicts: drivers/gpio/gpio-lynxpoint.c
2 parents 0963d59 + 31d141e commit b41fb43

File tree

266 files changed

+1789
-1565
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

266 files changed

+1789
-1565
lines changed

‎Documentation/ABI/stable/sysfs-bus-usb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ Description:
3737
that the USB device has been connected to the machine. This
3838
file is read-only.
3939
Users:
40-
PowerTOP <power@bughost.org>
41-
http://www.lesswatts.org/projects/powertop/
40+
PowerTOP <[email protected].org>
41+
https://01.org/powertop/
4242

4343
What: /sys/bus/usb/device/.../power/active_duration
4444
Date: January 2008
@@ -57,8 +57,8 @@ Description:
5757
will give an integer percentage. Note that this does not
5858
account for counter wrap.
5959
Users:
60-
PowerTOP <power@bughost.org>
61-
http://www.lesswatts.org/projects/powertop/
60+
PowerTOP <[email protected].org>
61+
https://01.org/powertop/
6262

6363
What: /sys/bus/usb/devices/<busnum>-<port[.port]>...:<config num>-<interface num>/supports_autosuspend
6464
Date: January 2008

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
What: /sys/devices/.../power/
22
Date: January 2009
3-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
3+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
44
Description:
55
The /sys/devices/.../power directory contains attributes
66
allowing the user space to check and modify some power
77
management related properties of given device.
88

99
What: /sys/devices/.../power/wakeup
1010
Date: January 2009
11-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
11+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
1212
Description:
1313
The /sys/devices/.../power/wakeup attribute allows the user
1414
space to check if the device is enabled to wake up the system
@@ -34,7 +34,7 @@ Description:
3434

3535
What: /sys/devices/.../power/control
3636
Date: January 2009
37-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
37+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
3838
Description:
3939
The /sys/devices/.../power/control attribute allows the user
4040
space to control the run-time power management of the device.
@@ -53,7 +53,7 @@ Description:
5353

5454
What: /sys/devices/.../power/async
5555
Date: January 2009
56-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
56+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
5757
Description:
5858
The /sys/devices/.../async attribute allows the user space to
5959
enable or diasble the device's suspend and resume callbacks to
@@ -79,7 +79,7 @@ Description:
7979

8080
What: /sys/devices/.../power/wakeup_count
8181
Date: September 2010
82-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
82+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
8383
Description:
8484
The /sys/devices/.../wakeup_count attribute contains the number
8585
of signaled wakeup events associated with the device. This
@@ -88,7 +88,7 @@ Description:
8888

8989
What: /sys/devices/.../power/wakeup_active_count
9090
Date: September 2010
91-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
91+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
9292
Description:
9393
The /sys/devices/.../wakeup_active_count attribute contains the
9494
number of times the processing of wakeup events associated with
@@ -98,7 +98,7 @@ Description:
9898

9999
What: /sys/devices/.../power/wakeup_abort_count
100100
Date: February 2012
101-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
101+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
102102
Description:
103103
The /sys/devices/.../wakeup_abort_count attribute contains the
104104
number of times the processing of a wakeup event associated with
@@ -109,7 +109,7 @@ Description:
109109

110110
What: /sys/devices/.../power/wakeup_expire_count
111111
Date: February 2012
112-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
112+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
113113
Description:
114114
The /sys/devices/.../wakeup_expire_count attribute contains the
115115
number of times a wakeup event associated with the device has
@@ -119,7 +119,7 @@ Description:
119119

120120
What: /sys/devices/.../power/wakeup_active
121121
Date: September 2010
122-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
122+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
123123
Description:
124124
The /sys/devices/.../wakeup_active attribute contains either 1,
125125
or 0, depending on whether or not a wakeup event associated with
@@ -129,7 +129,7 @@ Description:
129129

130130
What: /sys/devices/.../power/wakeup_total_time_ms
131131
Date: September 2010
132-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
132+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
133133
Description:
134134
The /sys/devices/.../wakeup_total_time_ms attribute contains
135135
the total time of processing wakeup events associated with the
@@ -139,7 +139,7 @@ Description:
139139

140140
What: /sys/devices/.../power/wakeup_max_time_ms
141141
Date: September 2010
142-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
142+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
143143
Description:
144144
The /sys/devices/.../wakeup_max_time_ms attribute contains
145145
the maximum time of processing a single wakeup event associated
@@ -149,7 +149,7 @@ Description:
149149

150150
What: /sys/devices/.../power/wakeup_last_time_ms
151151
Date: September 2010
152-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
152+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
153153
Description:
154154
The /sys/devices/.../wakeup_last_time_ms attribute contains
155155
the value of the monotonic clock corresponding to the time of
@@ -160,7 +160,7 @@ Description:
160160

161161
What: /sys/devices/.../power/wakeup_prevent_sleep_time_ms
162162
Date: February 2012
163-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
163+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
164164
Description:
165165
The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute
166166
contains the total time the device has been preventing
@@ -189,7 +189,7 @@ Description:
189189

190190
What: /sys/devices/.../power/pm_qos_latency_us
191191
Date: March 2012
192-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
192+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
193193
Description:
194194
The /sys/devices/.../power/pm_qos_resume_latency_us attribute
195195
contains the PM QoS resume latency limit for the given device,
@@ -207,7 +207,7 @@ Description:
207207

208208
What: /sys/devices/.../power/pm_qos_no_power_off
209209
Date: September 2012
210-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
210+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
211211
Description:
212212
The /sys/devices/.../power/pm_qos_no_power_off attribute
213213
is used for manipulating the PM QoS "no power off" flag. If
@@ -222,7 +222,7 @@ Description:
222222

223223
What: /sys/devices/.../power/pm_qos_remote_wakeup
224224
Date: September 2012
225-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
225+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
226226
Description:
227227
The /sys/devices/.../power/pm_qos_remote_wakeup attribute
228228
is used for manipulating the PM QoS "remote wakeup required"

‎Documentation/ABI/testing/sysfs-power

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
What: /sys/power/
22
Date: August 2006
3-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
3+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
44
Description:
55
The /sys/power directory will contain files that will
66
provide a unified interface to the power management
77
subsystem.
88

99
What: /sys/power/state
1010
Date: August 2006
11-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
11+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
1212
Description:
1313
The /sys/power/state file controls the system power state.
1414
Reading from this file returns what states are supported,
@@ -22,7 +22,7 @@ Description:
2222

2323
What: /sys/power/disk
2424
Date: September 2006
25-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
25+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
2626
Description:
2727
The /sys/power/disk file controls the operating mode of the
2828
suspend-to-disk mechanism. Reading from this file returns
@@ -67,7 +67,7 @@ Description:
6767

6868
What: /sys/power/image_size
6969
Date: August 2006
70-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
70+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
7171
Description:
7272
The /sys/power/image_size file controls the size of the image
7373
created by the suspend-to-disk mechanism. It can be written a
@@ -84,7 +84,7 @@ Description:
8484

8585
What: /sys/power/pm_trace
8686
Date: August 2006
87-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
87+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
8888
Description:
8989
The /sys/power/pm_trace file controls the code which saves the
9090
last PM event point in the RTC across reboots, so that you can
@@ -133,7 +133,7 @@ Description:
133133

134134
What: /sys/power/pm_async
135135
Date: January 2009
136-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
136+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
137137
Description:
138138
The /sys/power/pm_async file controls the switch allowing the
139139
user space to enable or disable asynchronous suspend and resume
@@ -146,7 +146,7 @@ Description:
146146

147147
What: /sys/power/wakeup_count
148148
Date: July 2010
149-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
149+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
150150
Description:
151151
The /sys/power/wakeup_count file allows user space to put the
152152
system into a sleep state while taking into account the
@@ -161,7 +161,7 @@ Description:
161161

162162
What: /sys/power/reserved_size
163163
Date: May 2011
164-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
164+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
165165
Description:
166166
The /sys/power/reserved_size file allows user space to control
167167
the amount of memory reserved for allocations made by device
@@ -175,7 +175,7 @@ Description:
175175

176176
What: /sys/power/autosleep
177177
Date: April 2012
178-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
178+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
179179
Description:
180180
The /sys/power/autosleep file can be written one of the strings
181181
returned by reads from /sys/power/state. If that happens, a
@@ -192,7 +192,7 @@ Description:
192192

193193
What: /sys/power/wake_lock
194194
Date: February 2012
195-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
195+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
196196
Description:
197197
The /sys/power/wake_lock file allows user space to create
198198
wakeup source objects and activate them on demand (if one of
@@ -219,7 +219,7 @@ Description:
219219

220220
What: /sys/power/wake_unlock
221221
Date: February 2012
222-
Contact: Rafael J. Wysocki <rjw@sisk.pl>
222+
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
223223
Description:
224224
The /sys/power/wake_unlock file allows user space to deactivate
225225
wakeup sources created with the help of /sys/power/wake_lock.

‎Documentation/acpi/dsdt-override.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ CONFIG_ACPI_CUSTOM_DSDT builds the image into the kernel.
44

55
When to use this method is described in detail on the
66
Linux/ACPI home page:
7-
http://www.lesswatts.org/projects/acpi/overridingDSDT.php
7+
https://01.org/linux-acpi/documentation/overriding-dsdt

0 commit comments

Comments
 (0)