Merge branch 'master' of... (8b1aaeaf) · Commits · e / devices / android_kernel_fairphone_FP3

CREDITS

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -328,7 +328,7 @@ S: Haifa, Israel
	N: Johannes Berg		N: Johannes Berg
	E: johannes@sipsolutions.net		E: johannes@sipsolutions.net
	W: http://johannes.sipsolutions.net/		W: http://johannes.sipsolutions.net/
	P: 1024D/9AB78CA5 AD02 0176 4E29 C137 1DF6 08D2 FC44 CF86 9AB7 8CA5		P: 4096R/7BF9099A C0EB C440 F6DA 091C 884D 8532 E0F3 73F3 7BF9 099A
	D: powerpc & 802.11 hacker		D: powerpc & 802.11 hacker

	N: Stephen R. van den Berg (AKA BuGless)		N: Stephen R. van den Berg (AKA BuGless)

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -328,8 +328,6 @@ sysrq.txt
	- info on the magic SysRq key.		- info on the magic SysRq key.
	telephony/		telephony/
	- directory with info on telephony (e.g. voice over IP) support.		- directory with info on telephony (e.g. voice over IP) support.
	uml/
	- directory with information about User Mode Linux.
	unicode.txt		unicode.txt
	- info on the Unicode character/font mapping used in Linux.		- info on the Unicode character/font mapping used in Linux.
	unshare.txt		unshare.txt

0 → 100644

+10 −0

Original line number	Original line	Diff line number	Diff line
			What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/startup_profile
			Date: October 2010
			Contact: Stefan Achatz <erazor_de@users.sourceforge.net>
			Description: The integer value of this attribute ranges from 0-4.
			When read, this attribute returns the number of the actual
			profile. This value is persistent, so its equivalent to the
			profile that's active when the mouse is powered on next time.
			When written, this file sets the number of the startup profile
			and the mouse activates this profile immediately.
			Please use actual_profile, it does the same thing.

0 → 100644

+31 −0

Original line number	Original line	Diff line number	Diff line
			What: /sys/bus/bcma/devices/.../manuf
			Date: May 2011
			KernelVersion: 2.6.40
			Contact: Rafał Miłecki <zajec5@gmail.com>
			Description:
			Each BCMA core has it's manufacturer id. See
			include/linux/bcma/bcma.h for possible values.

			What: /sys/bus/bcma/devices/.../id
			Date: May 2011
			KernelVersion: 2.6.40
			Contact: Rafał Miłecki <zajec5@gmail.com>
			Description:
			There are a few types of BCMA cores, they can be identified by
			id field.

			What: /sys/bus/bcma/devices/.../rev
			Date: May 2011
			KernelVersion: 2.6.40
			Contact: Rafał Miłecki <zajec5@gmail.com>
			Description:
			BCMA cores of the same type can still slightly differ depending
			on their revision. Use it for detailed programming.

			What: /sys/bus/bcma/devices/.../class
			Date: May 2011
			KernelVersion: 2.6.40
			Contact: Rafał Miłecki <zajec5@gmail.com>
			Description:
			Each BCMA core is identified by few fields, including class it
			belongs to. See include/linux/bcma/bcma.h for possible values.

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -74,6 +74,15 @@ Description:
	hot-remove the PCI device and any of its children.		hot-remove the PCI device and any of its children.
	Depends on CONFIG_HOTPLUG.		Depends on CONFIG_HOTPLUG.

			What: /sys/bus/pci/devices/.../pci_bus/.../rescan
			Date: May 2011
			Contact: Linux PCI developers <linux-pci@vger.kernel.org>
			Description:
			Writing a non-zero value to this attribute will
			force a rescan of the bus and all child buses,
			and re-discover devices removed earlier from this
			part of the device tree. Depends on CONFIG_HOTPLUG.

	What: /sys/bus/pci/devices/.../rescan		What: /sys/bus/pci/devices/.../rescan
	Date: January 2009		Date: January 2009
	Contact: Linux PCI developers <linux-pci@vger.kernel.org>		Contact: Linux PCI developers <linux-pci@vger.kernel.org>