diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 15:48:52 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 15:48:52 -0400 |
| commit | e75d660672ddd11704b7f0fdb8ff21968587b266 (patch) | |
| tree | ccb9c107744c10b553c0373e450bee3971d16c00 /Documentation/usb | |
| parent | 61282f37927143e45b03153f3e7b48d6b702147a (diff) | |
| parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
Merge branch 'master' into for-next
Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.
Conflicts:
drivers/net/ethernet/realtek/r8169.c
Diffstat (limited to 'Documentation/usb')
| -rw-r--r-- | Documentation/usb/power-management.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/usb/power-management.txt b/Documentation/usb/power-management.txt index 817df299ea07..4204eb01fd38 100644 --- a/Documentation/usb/power-management.txt +++ b/Documentation/usb/power-management.txt | |||
| @@ -179,7 +179,8 @@ do: | |||
| 179 | 179 | ||
| 180 | modprobe usbcore autosuspend=5 | 180 | modprobe usbcore autosuspend=5 |
| 181 | 181 | ||
| 182 | Equivalently, you could add to /etc/modprobe.conf a line saying: | 182 | Equivalently, you could add to a configuration file in /etc/modprobe.d |
| 183 | a line saying: | ||
| 183 | 184 | ||
| 184 | options usbcore autosuspend=5 | 185 | options usbcore autosuspend=5 |
| 185 | 186 | ||