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)
commitf29b542183df7dc74664799c356f9a041f67a10b
tree2eaafa2253e55c22b08e64f6012f14917bc893a5
parent0265e1ae64ebf1bb55a563599d11fb7376478ae1
parent3ca041ed04734c1709460184f985f5451a813d69
Merge branch 'asoc-dt' into asoc-omap
include/sound/soc.h