Merge tag 'v3.2-rc2' into staging/for_v3.3 (12cbfd0a) · Commits · jan.koester / Linux

.mailmap

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -68,6 +68,7 @@ Juha Yrjola <juha.yrjola@solidboot.com>
	Kay Sievers <kay.sievers@vrfy.org>		Kay Sievers <kay.sievers@vrfy.org>
	Kenneth W Chen <kenneth.w.chen@intel.com>		Kenneth W Chen <kenneth.w.chen@intel.com>
	Koushik <raghavendra.koushik@neterion.com>		Koushik <raghavendra.koushik@neterion.com>
			Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
	Leonid I Ananiev <leonid.i.ananiev@intel.com>		Leonid I Ananiev <leonid.i.ananiev@intel.com>
	Linas Vepstas <linas@austin.ibm.com>		Linas Vepstas <linas@austin.ibm.com>
	Mark Brown <broonie@sirena.org.uk>		Mark Brown <broonie@sirena.org.uk>
	@@ -111,3 +112,4 @@ Uwe Kleine-König <ukl@pengutronix.de>
	Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>		Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
	Valdis Kletnieks <Valdis.Kletnieks@vt.edu>		Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
	Takashi YOSHII <takashi.yoshii.zj@renesas.com>		Takashi YOSHII <takashi.yoshii.zj@renesas.com>
			Yusuke Goda <goda.yusuke@renesas.com>

0 → 100644

+22 −0

Original line number	Original line	Diff line number	Diff line
			What: /sys/firmware/acpi/pm_profile
			Date: 03-Nov-2011
			KernelVersion: v3.2
			Contact: linux-acpi@vger.kernel.org
			Description: The ACPI pm_profile sysfs interface exports the platform
			power management (and performance) requirement expectations
			as provided by BIOS. The integer value is directly passed as
			retrieved from the FADT ACPI table.
			Values: For possible values see ACPI specification:
			5.2.9 Fixed ACPI Description Table (FADT)
			Field: Preferred_PM_Profile

			Currently these values are defined by spec:
			0 Unspecified
			1 Desktop
			2 Mobile
			3 Workstation
			4 Enterprise Server
			5 SOHO Server
			6 Appliance PC
			7 Performance Server
			>7 Reserved

0 → 100644

+19 −0

Original line number	Original line	Diff line number	Diff line
			What: /sys/kernel/debug/ideapad/cfg
			Date: Sep 2011
			KernelVersion: 3.2
			Contact: Ike Panhc <ike.pan@canonical.com>
			Description:

			cfg shows the return value of _CFG method in VPC2004 device. It tells machine
			capability and what graphic component within the machine.


			What: /sys/kernel/debug/ideapad/status
			Date: Sep 2011
			KernelVersion: 3.2
			Contact: Ike Panhc <ike.pan@canonical.com>
			Description:

			status shows infos we can read and tells its meaning and value.

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -71,3 +71,10 @@ Description: Value of 1 indicates the controller can honor the reset_devices
	a dump device, as kdump requires resetting the device in order		a dump device, as kdump requires resetting the device in order
	to work reliably.		to work reliably.

			Where: /sys/bus/pci/devices/<dev>/ccissX/transport_mode
			Date: July 2011
			Kernel Version: 3.0
			Contact: iss_storagedev@hp.com
			Description: Value of "simple" indicates that the controller has been placed
			in "simple mode". Value of "performant" indicates that the
			controller has been placed in "performant mode".

+0 −15

Original line number	Original line	Diff line number	Diff line
	@@ -5,19 +5,4 @@ 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)