Merge remote-tracking branches 'asoc/fix/ad1980' and 'asoc/fix/isabelle' into asoc...
authorMark Brown <broonie@linaro.org>
Sun, 23 Feb 2014 03:20:32 +0000 (12:20 +0900)
committerMark Brown <broonie@linaro.org>
Sun, 23 Feb 2014 03:20:32 +0000 (12:20 +0900)

Trivial merge