Merge branch 'spi-mcspi' into spi-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 14 Nov 2012 03:16:50 +0000 (12:16 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 14 Nov 2012 03:16:50 +0000 (12:16 +0900)
commit170c2d0a87922adb43a8e8ca47cba3e30407d4d6
tree1e2d95a01484072e00bfa3267636e1d7836bcbd6
parent8266bdd2d716c08c3ebb1d6975daec88826d7f75
parent2cd451792db174382aaca96c75bc3bf47a6065fe
Merge branch 'spi-mcspi' into spi-next
drivers/spi/spi-omap2-mcspi.c