Jiri Kosina 318ae2edc3 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		2010-03-08 16:55:37 +01:00
..
00-INDEX	doc: update 00-INDEX for Documentation/laptops/	2010-02-05 12:22:38 +01:00
acer-wmi.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
asus-laptop.txt	asus-laptop: document the module	2009-08-28 15:21:13 -04:00
disk-shock-protection.txt	ata: Add documentation for hard disk shock protection interface (v3)	2008-10-13 21:39:50 +02:00
laptop-mode.txt	laptops: move laptop-mode.txt to Documentation/laptops/	2008-03-12 02:37:21 -04:00
sony-laptop.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
sonypi.txt	sonypi - Move sonypi.txt to Documentation/laptops	2008-02-09 04:15:53 -05:00
thinkpad-acpi.txt	thinkpad-acpi: lock down video output state access	2010-02-25 22:22:22 -03:00