Merge remote-tracking branch 'asoc/topic/core' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 11 Feb 2013 11:06:30 +0000 (11:06 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 11 Feb 2013 11:06:30 +0000 (11:06 +0000)
commitd289323286d6b4e738458c31533da51d294d28a0
tree64a3869290395a9eaafacd26cf992278f4302f7b
parent6a47366973be7d234952332e09646981951d3879
parentb5a8fe439ab343631d905a51438db3de54ba94df
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
include/sound/soc-dai.h
include/sound/soc.h
sound/soc/soc-core.c
sound/soc/soc-pcm.c