Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e95e365 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge remote branch 'wireless-next/master' into ath6kl-next

Conflicts:
	drivers/net/wireless/ath/ath6kl/init.c
parents 3ca9d1fc 5bd5e9a6
Loading
Loading
Loading
Loading
+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>
+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
+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.

+13 −0
Original line number Original line Diff line number Diff line
@@ -206,3 +206,16 @@ Description:
		when a discarded area is read the discard_zeroes_data
		when a discarded area is read the discard_zeroes_data
		parameter will be set to one. Otherwise it will be 0 and
		parameter will be set to one. Otherwise it will be 0 and
		the result of reading a discarded area is undefined.
		the result of reading a discarded area is undefined.
What:		/sys/block/<disk>/alias
Date:		Aug 2011
Contact:	Nao Nishijima <nao.nishijima.xt@hitachi.com>
Description:
		A raw device name of a disk does not always point a same disk
		each boot-up time. Therefore, users have to use persistent
		device names, which udev creates when the kernel finds a disk,
		instead of raw device name. However, kernel doesn't show those
		persistent names on its messages (e.g. dmesg).
		This file can store an alias of the disk and it would be
		appeared in kernel messages if it is set. A disk can have an
		alias which length is up to 255bytes. Users can use alphabets,
		numbers, "-" and "_" in alias name. This file is writeonce.
+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".
Loading