Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ (87e8b821) · Commits · e / devices / android_kernel_fairphone_FP4

.gitignore

+12 −7

Original line number	Diff line number	Diff line
		@@ -34,13 +34,18 @@ modules.builtin
		#
		# Top-level generic files
		#
		tags
		TAGS
		vmlinux
		vmlinuz
		System.map
		Module.markers
		Module.symvers
		/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
		#
		!.gitignore
		!.mailmap

Documentation/ABI/stable/sysfs-devices-node

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		What: /sys/devices/system/node/nodeX
		Date: October 2002
		Contact: Linux Memory Management list <linux-mm@kvack.org>
		Description:
		When CONFIG_NUMA is enabled, this is a directory containing
		information on node X such as what CPUs are local to the
		node.

Documentation/ABI/testing/sysfs-bus-usb

+11 −0

Original line number	Diff line number	Diff line
		@@ -159,3 +159,14 @@ 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_quirk
		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

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

+6 −6

Original line number	Diff line number	Diff line
		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,7 +13,7 @@ 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>
		@@ -21,7 +21,7 @@ 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>
		@@ -29,11 +29,11 @@ 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>

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

+5 −5

Original line number	Diff line number	Diff line
		What: /sys/devices/platform/eeepc-laptop/disp
		What: /sys/devices/platform/eeepc/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-laptop/camera
		What: /sys/devices/platform/eeepc/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-laptop/cardr
		What: /sys/devices/platform/eeepc/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-laptop/cpufv
		What: /sys/devices/platform/eeepc/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-laptop/available_cpufv
		What: /sys/devices/platform/eeepc/available_cpufv
		Date: Jun 2009
		KernelVersion: 2.6.31
		Contact: "Corentin Chary" <corentincj@iksaif.net>