Merge tag 'v3.1-rc6' into staging/for_v3.2 (75779112) · Commits · e / devices / android_kernel_fairphone_FP3

CREDITS

+16 −1

Original line number	Original line	Diff line number	Diff line
	@@ -504,7 +504,7 @@ N: Dominik Brodowski
	E: linux@brodo.de		E: linux@brodo.de
	W: http://www.brodo.de/		W: http://www.brodo.de/
	P: 1024D/725B37C6 190F 3E77 9C89 3B6D BECD 46EE 67C3 0308 725B 37C6		P: 1024D/725B37C6 190F 3E77 9C89 3B6D BECD 46EE 67C3 0308 725B 37C6
	D: parts of CPUFreq code, ACPI bugfixes		D: parts of CPUFreq code, ACPI bugfixes, PCMCIA rewrite, cpufrequtils
	S: Tuebingen, Germany		S: Tuebingen, Germany

	N: Andries Brouwer		N: Andries Brouwer
	@@ -857,6 +857,10 @@ S: One Dell Way
	S: Round Rock, TX 78682		S: Round Rock, TX 78682
	S: USA		S: USA

			N: Mattia Dongili
			E: malattia@gmail.com
			D: cpufrequtils (precursor to cpupowerutils)

	N: Ben Dooks		N: Ben Dooks
	E: ben-linux@fluff.org		E: ben-linux@fluff.org
	E: ben@simtec.co.uk		E: ben@simtec.co.uk
	@@ -1883,6 +1887,11 @@ S: Kruislaan 419
	S: 1098 VA Amsterdam		S: 1098 VA Amsterdam
	S: The Netherlands		S: The Netherlands

			N: Goran Koruga
			E: korugag@siol.net
			D: cpufrequtils (precursor to cpupowerutils)
			S: Slovenia

	N: Jiri Kosina		N: Jiri Kosina
	E: jikos@jikos.cz		E: jikos@jikos.cz
	E: jkosina@suse.cz		E: jkosina@suse.cz
	@@ -2916,6 +2925,12 @@ S: Schlossbergring 9
	S: 79098 Freiburg		S: 79098 Freiburg
	S: Germany		S: Germany

			N: Thomas Renninger
			E: trenn@suse.de
			D: cpupowerutils
			S: SUSE Linux GmbH
			S: Germany

	N: Joerg Reuter		N: Joerg Reuter
	E: jreuter@yaina.de		E: jreuter@yaina.de
	W: http://yaina.de/jreuter/		W: http://yaina.de/jreuter/

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -272,6 +272,8 @@ printk-formats.txt
	- how to get printk format specifiers right		- how to get printk format specifiers right
	prio_tree.txt		prio_tree.txt
	- info on radix-priority-search-tree use for indexing vmas.		- info on radix-priority-search-tree use for indexing vmas.
			ramoops.txt
			- documentation of the ramoops oops/panic logging module.
	rbtree.txt		rbtree.txt
	- info on what red-black trees are and what they are for.		- info on what red-black trees are and what they are for.
	robust-futex-ABI.txt		robust-futex-ABI.txt

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -39,3 +39,9 @@ Description: Generic interface to platform dependent persistent storage.
	multiple) files based on the record size of the underlying		multiple) files based on the record size of the underlying
	persistent storage until at least this amount is reached.		persistent storage until at least this amount is reached.
	Default is 10 Kbytes.		Default is 10 Kbytes.

			Pstore only supports one backend at a time. If multiple
			backends are available, the preferred backend may be
			set by passing the pstore.backend= argument to the kernel at
			boot time.

+17 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4,3 +4,20 @@ KernelVersion: 2.6.37
	Contact: "Ike Panhc <ike.pan@canonical.com>"		Contact: "Ike Panhc <ike.pan@canonical.com>"
	Description:		Description:
	Control the power of camera module. 1 means on, 0 means off.		Control the power of camera module. 1 means on, 0 means off.

			What: /sys/devices/platform/ideapad/cfg
			Date: Jun 2011
			KernelVersion: 3.1
			Contact: "Ike Panhc <ike.pan@canonical.com>"
			Description:
			Ideapad capability bits.
			Bit 8-10: 1 - Intel graphic only
			2 - ATI graphic only
			3 - Nvidia graphic only
			4 - Intel and ATI graphic
			5 - Intel and Nvidia graphic
			Bit 16: Bluetooth exist (1 for exist)
			Bit 17: 3G exist (1 for exist)
			Bit 18: Wifi exist (1 for exist)
			Bit 19: Camera exist (1 for exist)

+7 −16

Original line number	Original line	Diff line number	Diff line
	@@ -80,22 +80,13 @@ available tools.
	The limit on the length of lines is 80 columns and this is a strongly		The limit on the length of lines is 80 columns and this is a strongly
	preferred limit.		preferred limit.

	Statements longer than 80 columns will be broken into sensible chunks.		Statements longer than 80 columns will be broken into sensible chunks, unless
	Descendants are always substantially shorter than the parent and are placed		exceeding 80 columns significantly increases readability and does not hide
	substantially to the right. The same applies to function headers with a long		information. Descendants are always substantially shorter than the parent and
	argument list. Long strings are as well broken into shorter strings. The		are placed substantially to the right. The same applies to function headers
	only exception to this is where exceeding 80 columns significantly increases		with a long argument list. However, never break user-visible strings such as
	readability and does not hide information.		printk messages, because that breaks the ability to grep for them.

	void fun(int a, int b, int c)
	{
	if (condition)
	printk(KERN_WARNING "Warning this is a long printk with "
	"3 parameters a: %u b: %u "
	"c: %u \n", a, b, c);
	else
	next_statement;
	}

	Chapter 3: Placing Braces and Spaces		Chapter 3: Placing Braces and Spaces