diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-18 00:19:51 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-18 00:19:51 +0100 |
| commit | b6e6dc80341028103e090190f209ef3866255230 (patch) | |
| tree | a8e718416f8be47703b491cb8831b54d0c0a830f /drivers/spi/Kconfig | |
| parent | 9a8d141d5ab1b50b3ab453fba1ee42da3b85919b (diff) | |
| parent | 812d6f6345d88632c11aeb602ef26f4616dabfa0 (diff) | |
| parent | 5c2301a990f166e095a134e25644f845abaf6168 (diff) | |
| parent | db1b8200e0d0ff8102a1836e4bd6baf1be4f564d (diff) | |
| parent | 4dacccfac69494ba70248b134352f299171c41b7 (diff) | |
Merge remote-tracking branches 'spi/topic/fsl-dspi', 'spi/topic/gpio', 'spi/topic/imx' and 'spi/topic/orion' into spi-next