Merge remote-tracking branches 'spi/topic/pxa', 'spi/topic/rb4xx', 'spi/topic/rspi...
authorMark Brown <broonie@kernel.org>
Wed, 17 Jun 2015 23:19:53 +0000 (00:19 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 17 Jun 2015 23:19:53 +0000 (00:19 +0100)
commitb9e2c097efe19c3c04ea3d84b295748e39e96c2b
treea52cecadb122dad57c525b2d3746db285ef77fb0
parentb6e6dc80341028103e090190f209ef3866255230
parent8422ddf762c6168a261b5ba07eeaa2f1238ba8c2
parentb2b3024ca5853b3ea6390a3388e4761fc16e0655
parentcc2e9328ed09cfd07c2b18e7d9d1826f30df9ec0
parent23f6d39ec0a7c33630e80ba6607dffe7788a4c42
parent3789c85206dd4efed58c83d1c29e865f22514410
Merge remote-tracking branches 'spi/topic/pxa', 'spi/topic/rb4xx', 'spi/topic/rspi', 'spi/topic/s3c64xx' and 'spi/topic/sh-msiof' into spi-next
drivers/spi/Kconfig
drivers/spi/Makefile