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

Commit 0a87a2db authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'topic/i915-hda-componentized-2015-01-12' into drm-intel-next-queued 



Conflicts:
	drivers/gpu/drm/i915/intel_runtime_pm.c

Separate branch so that Takashi can also pull just this refactoring
into sound-next.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents 7226572d fcf3aac5

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -96,3 +96,6 @@ x509.genkey 


# Kconfig presets

all.config



# Kdevelop4

*.kdev4

.mailmap

+4 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Aleksey Gorelov <aleksey_gorelov@phoenix.com> 
Al Viro <viro@ftp.linux.org.uk>

Al Viro <viro@zenIV.linux.org.uk>

Andreas Herrmann <aherrman@de.ibm.com>

Andrew Morton <akpm@osdl.org>

Andrew Morton <akpm@linux-foundation.org>

Andrew Vasquez <andrew.vasquez@qlogic.com>

Andy Adamson <andros@citi.umich.edu>

Archit Taneja <archit@ti.com>
@@ -51,6 +51,7 @@ Greg Kroah-Hartman <gregkh@suse.de> 
Greg Kroah-Hartman <greg@kroah.com>

Henk Vergonet <Henk.Vergonet@gmail.com>

Henrik Kretzschmar <henne@nachtwindheim.de>

Henrik Rydberg <rydberg@bitmath.org>

Herbert Xu <herbert@gondor.apana.org.au>

Jacob Shin <Jacob.Shin@amd.com>

James Bottomley <jejb@mulgrave.(none)>
@@ -102,6 +103,8 @@ Rudolf Marek <R.Marek@sh.cvut.cz> 
Rui Saraiva <rmps@joel.ist.utl.pt>

Sachin P Sant <ssant@in.ibm.com>

Sam Ravnborg <sam@mars.ravnborg.org>

Santosh Shilimkar <ssantosh@kernel.org>

Santosh Shilimkar <santosh.shilimkar@oracle.org>

Sascha Hauer <s.hauer@pengutronix.de>

S.Çağlar Onur <caglar@pardus.org.tr>

Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>

CREDITS

+3 −3
Original line number Diff line number Diff line
@@ -1734,14 +1734,14 @@ S: Chapel Hill, North Carolina 27514-4818 
S: USA



N: Dave Jones

E: davej@redhat.com

E: davej@codemonkey.org.uk

W: http://www.codemonkey.org.uk

D: Assorted VIA x86 support.

D: 2.5 AGPGART overhaul.

D: CPUFREQ maintenance.

D: Fedora kernel maintenance.

D: Fedora kernel maintenance (2003-2014).

D: 'Trinity' and similar fuzz testing work.

D: Misc/Other.

S: 314 Littleton Rd, Westford, MA 01886, USA



N: Martin Josfsson

E: gandalf@wlug.westbo.se

Documentation/ABI/stable/sysfs-bus-usb

+6 −8
Original line number Diff line number Diff line
@@ -32,10 +32,9 @@ Date: January 2008 
KernelVersion:	2.6.25

Contact:	Sarah Sharp <sarah.a.sharp@intel.com>

Description:

		If CONFIG_PM_RUNTIME is enabled then this file

		is present.  When read, it returns the total time (in msec)

		that the USB device has been connected to the machine.  This

		file is read-only.

		If CONFIG_PM is enabled, then this file is present.  When read,

		it returns the total time (in msec) that the USB device has been

		connected to the machine.  This file is read-only.

Users:

		PowerTOP <powertop@lists.01.org>

		https://01.org/powertop/
@@ -45,10 +44,9 @@ Date: January 2008 
KernelVersion:	2.6.25

Contact:	Sarah Sharp <sarah.a.sharp@intel.com>

Description:

		If CONFIG_PM_RUNTIME is enabled then this file

		is present.  When read, it returns the total time (in msec)

		that the USB device has been active, i.e. not in a suspended

		state.  This file is read-only.

		If CONFIG_PM is enabled, then this file is present.  When read,

		it returns the total time (in msec) that the USB device has been

		active, i.e. not in a suspended state.  This file is read-only.



		Tools can use this file and the connected_duration file to

		compute the percentage of time that a device has been active.

Documentation/ABI/stable/sysfs-class-udc

0 → 100644
+93 −0
Original line number Diff line number Diff line 
What:		/sys/class/udc/<udc>/a_alt_hnp_support

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Indicates if an OTG A-Host supports HNP at an alternate port.

Users:



What:		/sys/class/udc/<udc>/a_hnp_support

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Indicates if an OTG A-Host supports HNP at this port.

Users:



What:		/sys/class/udc/<udc>/b_hnp_enable

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Indicates if an OTG A-Host enabled HNP support.

Users:



What:		/sys/class/udc/<udc>/current_speed

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Indicates the current negotiated speed at this port.

Users:



What:		/sys/class/udc/<udc>/is_a_peripheral

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Indicates that this port is the default Host on an OTG session

		but HNP was used to switch roles.

Users:



What:		/sys/class/udc/<udc>/is_otg

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Indicates that this port support OTG.

Users:



What:		/sys/class/udc/<udc>/maximum_speed

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Indicates the maximum USB speed supported by this port.

Users:



What:		/sys/class/udc/<udc>/maximum_speed

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Indicates the maximum USB speed supported by this port.

Users:



What:		/sys/class/udc/<udc>/soft_connect

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Allows users to disconnect data pullup resistors thus causing a

		logical disconnection from the USB Host.

Users:



What:		/sys/class/udc/<udc>/srp

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Allows users to manually start Session Request Protocol.

Users:



What:		/sys/class/udc/<udc>/state

Date:		June 2011

KernelVersion:	3.1

Contact:	Felipe Balbi <balbi@kernel.org>

Description:

		Indicates current state of the USB Device Controller. Valid

		states are: 'not-attached', 'attached', 'powered',

		'reconnecting', 'unauthenticated', 'default', 'addressed',

		'configured', and 'suspended'; however not all USB Device

		Controllers support reporting all states.

Users: