Merge branch 'topic/rt286' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Tue, 27 Jan 2015 17:52:51 +0000 (17:52 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 27 Jan 2015 17:52:51 +0000 (17:52 +0000)
commita7834aa932e245a13fb2da59471672ca9bf3a7a5
treeb0176955acf09d94f1e6754b2b9653720cb50b45
parent96da4e5b2e1d04478fb6d540085f2859256ca788
parent54d96a40e0dfb5aa2eea0b010ddc1c7e8742e364
Merge branch 'topic/rt286' of git://git./linux/kernel/git/broonie/sound into asoc-w-codec

Conflicts:
sound/soc/codecs/rt286.c
sound/soc/codecs/rt286.c