Merge branch 'master' into for-next (e060c384) · Commits · jan.koester / Linux

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.

0 → 100644

+13 −0

Original line number	Original line	Diff line number	Diff line
			What: /sys/class/scsi_host/hostX/isci_id
			Date: June 2011
			Contact: Dave Jiang <dave.jiang@intel.com>
			Description:
			This file contains the enumerated host ID for the Intel
			SCU controller. The Intel(R) C600 Series Chipset SATA/SAS
			Storage Control Unit embeds up to two 4-port controllers in
			a single PCI device. The controllers are enumerated in order
			which usually means the lowest number scsi_host corresponds
			with the first controller, but this association is not
			guaranteed. The 'isci_id' attribute unambiguously identifies
			the controller index: '0' for the first controller,
			'1' for the second.

+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)