Merge remote-tracking branch 'sound-asoc/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 9 Apr 2015 03:53:58 +0000 (13:53 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 9 Apr 2015 03:53:58 +0000 (13:53 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 03:53:58 +0000 (13:53 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 03:53:58 +0000 (13:53 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
Simple merge
diff --cc include/sound/soc.h
Simple merge
diff --cc sound/soc/sh/fsi.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 03:53:58 +0000 (13:53 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 03:53:58 +0000 (13:53 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-armadillo800eva.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/sound/soc.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/sh/fsi.c	patch \|	diff1 \|	diff2 \|	blob \| history