Merge branch 'asoc-dt' into asoc-omap
authorMark Brown <broonie@linaro.org>
Thu, 1 May 2014 17:57:03 +0000 (10:57 -0700)
committerMark Brown <broonie@linaro.org>
Thu, 1 May 2014 17:57:03 +0000 (10:57 -0700)
1  2 
include/sound/soc.h

Simple merge