1
0
Fork 0
alistair23-linux/Documentation/laptops
David S. Miller 577f99c1d0 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/8021q/vlan_dev.c
2008-03-18 00:37:55 -07:00
..
00-INDEX laptops: move laptop-mode.txt to Documentation/laptops/ 2008-03-12 02:37:21 -04:00
acer-wmi.txt Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 2008-03-18 00:37:55 -07:00
laptop-mode.txt laptops: move laptop-mode.txt to Documentation/laptops/ 2008-03-12 02:37:21 -04:00
sony-laptop.txt sony-laptop - Move sony-laptop.txt to Documentation/laptops 2008-02-09 04:15:40 -05:00
sonypi.txt sonypi - Move sonypi.txt to Documentation/laptops 2008-02-09 04:15:53 -05:00
thinkpad-acpi.txt ACPI: thinkpad-acpi: add tablet-mode reporting 2008-02-16 00:34:06 -05:00