---

yaml
---
r: 187903
b: refs/heads/master
c: 87c1e12
h: refs/heads/master
i:
  187901: 3bed0a7
  187899: 2fddf71
  187895: e52e617
  187887: 2f1636d
  187871: f5ebde9
  187839: aa22dd8
  187775: ef71e1e
  187647: d395912
  187391: 9a787ad
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80a186074e72e2cd61f6716d90cf32ce54981a56
+refs/heads/master: 87c1e12b5eeb7b30b4b41291bef8e0b41fc3dde9

trunk/.gitignore

@@ -34,18 +34,13 @@ modules.builtin
 #
 # Top-level generic files
 #
-/tags
-/TAGS
-/linux
-/vmlinux
-/vmlinuz
-/System.map
-/Module.markers
-/Module.symvers
-
-#
-# git files that we don't want to ignore even it they are dot-files
-#
+tags
+TAGS
+vmlinux
+vmlinuz
+System.map
+Module.markers
+Module.symvers
 !.gitignore
 !.mailmap
 

trunk/Documentation/ABI/testing/sysfs-bus-usb

@@ -159,14 +159,3 @@ Description:
 		device.  This is useful to ensure auto probing won't
 		match the driver to the device.  For example:
 		# echo "046d c315" > /sys/bus/usb/drivers/foo/remove_id
-
-What:		/sys/bus/usb/device/.../avoid_reset
-Date:		December 2009
-Contact:	Oliver Neukum <oliver@neukum.org>
-Description:
-		Writing 1 to this file tells the kernel that this
-		device will morph into another mode when it is reset.
-		Drivers will not use reset for error handling for
-		such devices.
-Users:
-		usb_modeswitch

trunk/Documentation/ABI/testing/sysfs-platform-asus-laptop

@@ -1,4 +1,4 @@
-What:		/sys/devices/platform/asus_laptop/display
+What:		/sys/devices/platform/asus-laptop/display
 Date:		January 2007
 KernelVersion:	2.6.20
 Contact:	"Corentin Chary" <corentincj@iksaif.net>
@@ -13,27 +13,27 @@ Description:
 		Ex: - 0 (0000b) means no display
 		    - 3 (0011b) CRT+LCD.
 
-What:		/sys/devices/platform/asus_laptop/gps
+What:		/sys/devices/platform/asus-laptop/gps
 Date:		January 2007
 KernelVersion:	2.6.20
 Contact:	"Corentin Chary" <corentincj@iksaif.net>
 Description:
 		Control the gps device. 1 means on, 0 means off.
 Users:		Lapsus
 
-What:		/sys/devices/platform/asus_laptop/ledd
+What:		/sys/devices/platform/asus-laptop/ledd
 Date:		January 2007
 KernelVersion:	2.6.20
 Contact:	"Corentin Chary" <corentincj@iksaif.net>
 Description:
 		Some models like the W1N have a LED display that can be
 		used to display several informations.
 		To control the LED display, use the following :
-		    echo 0x0T000DDD > /sys/devices/platform/asus_laptop/
+		    echo 0x0T000DDD > /sys/devices/platform/asus-laptop/
 		where T control the 3 letters display, and DDD the 3 digits display.
 		The DDD table can be found in Documentation/laptops/asus-laptop.txt
 
-What:		/sys/devices/platform/asus_laptop/bluetooth
+What:		/sys/devices/platform/asus-laptop/bluetooth
 Date:		January 2007
 KernelVersion:	2.6.20
 Contact:	"Corentin Chary" <corentincj@iksaif.net>
@@ -42,7 +42,7 @@ Description:
 		This may control the led, the device or both.
 Users:		Lapsus
 
-What:		/sys/devices/platform/asus_laptop/wlan
+What:		/sys/devices/platform/asus-laptop/wlan
 Date:		January 2007
 KernelVersion:	2.6.20
 Contact:	"Corentin Chary" <corentincj@iksaif.net>

trunk/Documentation/ABI/testing/sysfs-platform-eeepc-laptop

@@ -1,4 +1,4 @@
-What:		/sys/devices/platform/eeepc/disp
+What:		/sys/devices/platform/eeepc-laptop/disp
 Date:		May 2008
 KernelVersion:	2.6.26
 Contact:	"Corentin Chary" <corentincj@iksaif.net>
@@ -9,21 +9,21 @@ Description:
 		- 3 = LCD+CRT
 		If you run X11, you should use xrandr instead.
 
-What:		/sys/devices/platform/eeepc/camera
+What:		/sys/devices/platform/eeepc-laptop/camera
 Date:		May 2008
 KernelVersion:	2.6.26
 Contact:	"Corentin Chary" <corentincj@iksaif.net>
 Description:
 		Control the camera. 1 means on, 0 means off.
 
-What:		/sys/devices/platform/eeepc/cardr
+What:		/sys/devices/platform/eeepc-laptop/cardr
 Date:		May 2008
 KernelVersion:	2.6.26
 Contact:	"Corentin Chary" <corentincj@iksaif.net>
 Description:
 		Control the card reader. 1 means on, 0 means off.
 
-What:		/sys/devices/platform/eeepc/cpufv
+What:		/sys/devices/platform/eeepc-laptop/cpufv
 Date:		Jun 2009
 KernelVersion:	2.6.31
 Contact:	"Corentin Chary" <corentincj@iksaif.net>
@@ -42,7 +42,7 @@ Description:
 		    `------------ Availables modes
 		For example, 0x301 means: mode 1 selected, 3 available modes.
 
-What:		/sys/devices/platform/eeepc/available_cpufv
+What:		/sys/devices/platform/eeepc-laptop/available_cpufv
 Date:		Jun 2009
 KernelVersion:	2.6.31
 Contact:	"Corentin Chary" <corentincj@iksaif.net>