]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'spi-mxs' into spi-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 17 Aug 2012 21:59:50 +0000 (22:59 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 17 Aug 2012 21:59:50 +0000 (22:59 +0100)

Trivial merge