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)
1  2 
include/sound/soc-dapm.h

Simple merge