Merge remote-tracking branch 'asoc/fix/simple' into asoc-linus
authorMark Brown <broonie@kernel.org>
Wed, 4 Mar 2015 20:42:43 +0000 (20:42 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 4 Mar 2015 20:42:43 +0000 (20:42 +0000)
commit2824ef9b81b0d440ed63e87f67f01f5cc942457f
tree2e93d8255a13d21d13fdf79ea6ce4e4243f95cbf
parent95d67c7fc2e5fa21befb1a07bc016748d9cd6192
parent31f3032c1a5504259f6fa8e0c7f8d2d3e2f5db48
Merge remote-tracking branch 'asoc/fix/simple' into asoc-linus