Merge branches 'spi-core' and 'spi-tegra' into spi-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 9 Nov 2012 16:47:00 +0000 (16:47 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 9 Nov 2012 16:47:00 +0000 (16:47 +0000)
commit19f15f0efdbdffeb29072208cfc666f61bf9897a
tree3fb72fcbe799de3cf52060df48383ff99a8290b4
parentfad8f9c0b28ff1b9c93ea91048c0be701407eb67
parentcaae070c48f39b4f7312e7473f6d3576f426e7fb
parent24bc89716163b4e30c1b71c9f4bd020387b13c96
Merge branches 'spi-core' and 'spi-tegra' into spi-next
drivers/spi/spi.c