Merge remote-tracking branch 'spi/topic/core' into spi-linus
authorMark Brown <broonie@linaro.org>
Thu, 23 Jan 2014 13:07:01 +0000 (13:07 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 23 Jan 2014 13:07:01 +0000 (13:07 +0000)
commit3c1039745ef2925aceed53d38af0cddac8e36f31
tree163fe6bf0ab203d69712936b3bda5d3e98acdeee
parent7e2c225d585cd6d7481ff4ec446a67334ef11f4d
parent1afd9989a6a2561183be82e420d4d2f3889b7ee7
Merge remote-tracking branch 'spi/topic/core' into spi-linus
drivers/spi/spi.c
include/linux/spi/spi.h