]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branches 'spi-drivers' and 'spi-mxs' into spi-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 25 Sep 2012 12:42:26 +0000 (13:42 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 25 Sep 2012 12:42:26 +0000 (13:42 +0100)
commit08896f71b3b8b60fabd371fd3c65132684babf8f
tree9fa303d09d865fa83383972bd2d898d186ca45e9
parent8e5d0661b3948f3c5a143f32d192710375822af2
parentac48f6cb5f268daff06b636444819e5ffb462611
Merge branches 'spi-drivers' and 'spi-mxs' into spi-next
drivers/spi/Kconfig
drivers/spi/Makefile