diff options
| author | Mark Brown <broonie@kernel.org> | 2014-12-08 07:17:15 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-08 07:17:15 -0500 |
| commit | dcf695b5f30e22063e85e27e77e18cc998a17fb1 (patch) | |
| tree | 2d96282fd9465784311c675149bfb3845ead22fe /drivers/spi/Makefile | |
| parent | 3bcfca617a3a773a981d6dfe0b8e2a95e614c5b7 (diff) | |
| parent | 409851c38c742e56747b1911a5091e22b6c8514f (diff) | |
| parent | 1a7e06d2602f388485ba507bbee70766408db8ee (diff) | |
| parent | cfb4bbd8fbed76a6b715916fabeca4597cb38721 (diff) | |
| parent | deba25800a12b99e1a68bc83d33709be4b9a40b7 (diff) | |
| parent | 1327ecd47fe4e36bae6bcda55b3282c08193286a (diff) | |
Merge remote-tracking branches 'spi/topic/fsl-dspi', 'spi/topic/fsl-espi', 'spi/topic/gpio', 'spi/topic/img-spfi' and 'spi/topic/meson' into spi-next