diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /Documentation/laptops | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'Documentation/laptops')
| -rw-r--r-- | Documentation/laptops/00-INDEX | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/laptops/00-INDEX b/Documentation/laptops/00-INDEX index ee5692b26dd4..df4fb52d4594 100644 --- a/Documentation/laptops/00-INDEX +++ b/Documentation/laptops/00-INDEX | |||
| @@ -2,6 +2,10 @@ | |||
| 2 | - This file | 2 | - This file |
| 3 | acer-wmi.txt | 3 | acer-wmi.txt |
| 4 | - information on the Acer Laptop WMI Extras driver. | 4 | - information on the Acer Laptop WMI Extras driver. |
| 5 | asus-laptop.txt | ||
| 6 | - information on the Asus Laptop Extras driver. | ||
| 7 | disk-shock-protection.txt | ||
| 8 | - information on hard disk shock protection. | ||
| 5 | laptop-mode.txt | 9 | laptop-mode.txt |
| 6 | - how to conserve battery power using laptop-mode. | 10 | - how to conserve battery power using laptop-mode. |
| 7 | sony-laptop.txt | 11 | sony-laptop.txt |