Merge tag 'ib-asoc-3.14.2' of git://git.linaro.org/people/ljones/mfd into asoc-tlw4030
authorMark Brown <broonie@linaro.org>
Wed, 8 Jan 2014 12:46:36 +0000 (12:46 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 8 Jan 2014 12:46:36 +0000 (12:46 +0000)
Immutable branch between MFD and ASoC due for the v3.14 merge window


Trivial merge