Merge branches 'topic/sc18is602' and 'topic/rspi' of git://git.kernel.org/pub/scm...
authorMark Brown <broonie@linaro.org>
Fri, 17 Jan 2014 15:52:17 +0000 (15:52 +0000)
committerMark Brown <broonie@linaro.org>
Fri, 17 Jan 2014 15:52:17 +0000 (15:52 +0000)

Trivial merge