Merge tag 'ib-asoc-3.14.2' into for-mfd-next
authorLee Jones <lee.jones@linaro.org>
Tue, 21 Jan 2014 08:26:12 +0000 (08:26 +0000)
committerLee Jones <lee.jones@linaro.org>
Tue, 21 Jan 2014 08:26:12 +0000 (08:26 +0000)
Immutable branch between MFD and ASoC due for the v3.14 merge window

1  2 
drivers/mfd/twl-core.c

Simple merge