Commit a52afea6 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next 

ASoC: Changes for v4.1

A selection of changes for v4.1 so far.  The main things are:

 - Move of jack registration to the card where it belongs.
 - Support for DAPM routes specified by both the machine driver and DT.
parents 8b28c93f d7e3281b

Documentation/cgroups/unified-hierarchy.txt

+2 −2
Original line number Diff line number Diff line
@@ -404,8 +404,8 @@ supported and the interface files "release_agent" and 
  be understood as an underflow into the highest possible value, -2 or

  -10M etc. do not work, so it's not consistent.



  memory.low, memory.high, and memory.max will use the string

  "infinity" to indicate and set the highest possible value.

  memory.low, memory.high, and memory.max will use the string "max" to

  indicate and set the highest possible value.



5. Planned Changes

Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ Required properties: 
  * Headphones

  * Speakers

  * Mic Jack

  * Int Mic



- nvidia,i2s-controller : The phandle of the Tegra I2S controller that's

  connected to the CODEC.

Documentation/filesystems/dlmfs.txt

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ system. 


dlmfs is built with OCFS2 as it requires most of its infrastructure.



Project web page:    http://oss.oracle.com/projects/ocfs2

Tools web page:      http://oss.oracle.com/projects/ocfs2-tools

Project web page:    http://ocfs2.wiki.kernel.org

Tools web page:      https://github.com/markfasheh/ocfs2-tools

OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/



All code copyright 2005 Oracle except when otherwise noted.

Documentation/filesystems/ocfs2.txt

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ also make it attractive for non-clustered use. 
You'll want to install the ocfs2-tools package in order to at least

get "mount.ocfs2" and "ocfs2_hb_ctl".



Project web page:    http://oss.oracle.com/projects/ocfs2

Tools web page:      http://oss.oracle.com/projects/ocfs2-tools

Project web page:    http://ocfs2.wiki.kernel.org

Tools git tree:      https://github.com/markfasheh/ocfs2-tools

OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/



All code copyright 2005 Oracle except when otherwise noted.

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -7213,8 +7213,7 @@ ORACLE CLUSTER FILESYSTEM 2 (OCFS2) 
M:	Mark Fasheh <mfasheh@suse.com>

M:	Joel Becker <jlbec@evilplan.org>

L:	ocfs2-devel@oss.oracle.com (moderated for non-subscribers)

W:	http://oss.oracle.com/projects/ocfs2/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git

W:	http://ocfs2.wiki.kernel.org

S:	Supported

F:	Documentation/filesystems/ocfs2.txt

F:	Documentation/filesystems/dlmfs.txt