OSDN Git Service

Merge branch 'spi-fix' into spi-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 1 Apr 2013 13:55:16 +0000 (14:55 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 1 Apr 2013 13:55:16 +0000 (14:55 +0100)
commite47ef0f1affff3e017d0477b283a26beeb45258a
treeae00210c3b875e235c3cea284c8bf44a841a5199
parent823cd0454325509d84dbf8e301c182c8a2711c65
parent1ad849aee5f53353ed88d9cd3d68a51b03a7d44f
Merge branch 'spi-fix' into spi-next
drivers/spi/spi-s3c64xx.c
drivers/spi/spi.c