Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
authorMark Brown <broonie@kernel.org>
Wed, 29 Apr 2015 12:37:26 +0000 (13:37 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 29 Apr 2015 12:37:26 +0000 (13:37 +0100)
commit449f1ca6253cb8d7bbe84666ac7d2696308d16c8
treeee0ad0fa000d9f2e48a7ab23874208c1ceb77c41
parentb787f68c36d49bb1d9236f403813641efa74a031
parenta2d97723cb3a7741af81868427b36bba274b681b
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
include/sound/soc-dapm.h