]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'spi-mxs' and 'spi-drivers' into spi-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 27 Aug 2012 16:40:14 +0000 (09:40 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 27 Aug 2012 16:40:14 +0000 (09:40 -0700)

Trivial merge