Merge branch 'topic/pcm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-enum

Conflicts:
	include/sound/soc.h
This commit is contained in:
Mark Brown 2014-03-06 17:07:39 +08:00
commit 6af5263cea
12 changed files with 143 additions and 94 deletions