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

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

Fri, 30 May 2014 01:59:55 +0000 (11:59 +1000)

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

Fri, 30 May 2014 01:59:55 +0000 (11:59 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:59:55 +0000 (11:59 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:59:55 +0000 (11:59 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/firewire/core.h
Simple merge
diff --cc sound/pci/hda/hda_intel.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 01:59:55 +0000 (11:59 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 01:59:55 +0000 (11:59 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/firewire/core.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_intel.c	patch \|	diff1 \|	diff2 \|	blob \| history