Merge branches 'spi-drivers' and 'spi-mxs' into spi-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 28 Sep 2012 13:05:29 +0000 (14:05 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 28 Sep 2012 13:05:29 +0000 (14:05 +0100)
commitf4b81dd83e38277a3d1e6661f0fa8eea8cfe784b
tree84bf6d90bad6468e3835f5f4b5443766dec56bf7
parent979570e02981d4a8fc20b3cc8fd651856c98ee9d
parentc09b890b763df3ccd79a2c34c2f1abeb73179caf
parentac48f6cb5f268daff06b636444819e5ffb462611
Merge branches 'spi-drivers' and 'spi-mxs' into spi-next
drivers/spi/Kconfig
drivers/spi/Makefile