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

Commit 4fda87df authored Mar 06, 2015 by Takashi Iwai

Merge tag 'asoc-fix-v4.0-rc2' of...

Merge tag 'asoc-fix-v4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v4.0

A few driver specific fixes here, none of them earth shattering in
themselves, that have accumliated since the opening of the merge window.

parents 70658b99 3b8f4a70

Documentation/cgroups/unified-hierarchy.txt

+2 −2

Original line number	Original line	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		be understood as an underflow into the highest possible value, -2 or
	-10M etc. do not work, so it's not consistent.		-10M etc. do not work, so it's not consistent.

	memory.low, memory.high, and memory.max will use the string		memory.low, memory.high, and memory.max will use the string "max" to
	"infinity" to indicate and set the highest possible value.		indicate and set the highest possible value.

	5. Planned Changes		5. Planned Changes

Documentation/filesystems/dlmfs.txt

+2 −2

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

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

	Project web page: http://oss.oracle.com/projects/ocfs2		Project web page: http://ocfs2.wiki.kernel.org
	Tools web page: http://oss.oracle.com/projects/ocfs2-tools		Tools web page: https://github.com/markfasheh/ocfs2-tools
	OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/		OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/

	All code copyright 2005 Oracle except when otherwise noted.		All code copyright 2005 Oracle except when otherwise noted.

Documentation/filesystems/ocfs2.txt

+2 −2

Original line number	Original line	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		You'll want to install the ocfs2-tools package in order to at least
	get "mount.ocfs2" and "ocfs2_hb_ctl".		get "mount.ocfs2" and "ocfs2_hb_ctl".

	Project web page: http://oss.oracle.com/projects/ocfs2		Project web page: http://ocfs2.wiki.kernel.org
	Tools web page: http://oss.oracle.com/projects/ocfs2-tools		Tools git tree: https://github.com/markfasheh/ocfs2-tools
	OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/		OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/

	All code copyright 2005 Oracle except when otherwise noted.		All code copyright 2005 Oracle except when otherwise noted.

MAINTAINERS

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -7213,8 +7213,7 @@ ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
	M: Mark Fasheh <mfasheh@suse.com>		M: Mark Fasheh <mfasheh@suse.com>
	M: Joel Becker <jlbec@evilplan.org>		M: Joel Becker <jlbec@evilplan.org>
	L: ocfs2-devel@oss.oracle.com (moderated for non-subscribers)		L: ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
	W: http://oss.oracle.com/projects/ocfs2/		W: http://ocfs2.wiki.kernel.org
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git
	S: Supported		S: Supported
	F: Documentation/filesystems/ocfs2.txt		F: Documentation/filesystems/ocfs2.txt
	F: Documentation/filesystems/dlmfs.txt		F: Documentation/filesystems/dlmfs.txt

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 4		VERSION = 4
	PATCHLEVEL = 0		PATCHLEVEL = 0
	SUBLEVEL = 0		SUBLEVEL = 0
	EXTRAVERSION = -rc1		EXTRAVERSION = -rc2
	NAME = Hurr durr I'ma sheep		NAME = Hurr durr I'ma sheep

	# DOCUMENTATION		# DOCUMENTATION