diff options
author | Mark Brown <broonie@kernel.org> | 2016-09-30 09:14:22 -0700 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-09-30 09:14:22 -0700 |
commit | 2ce04684335f886fb5adb9ecbd2a85affca549d1 (patch) | |
tree | dd67252cbd4b624531405c79d3a847e46f8b44e5 /drivers/spi/spi-imx.c | |
parent | 3424ff29a0c245a7bebe51b6af21cff1e3dd315e (diff) | |
parent | 5720ec0a6d2605930934f3f154b048e8be3d8a40 (diff) | |
parent | 2a4635ea1d39affd8bc9d33b062b03f33c910889 (diff) | |
parent | 1ae4ec1415a98328b693db588f30d02bb3ca73aa (diff) | |
parent | 097d06192caf6db29ff6b8a9117cfaf7a514821f (diff) | |
download | linux-2ce04684335f886fb5adb9ecbd2a85affca549d1.tar.bz2 |
Merge remote-tracking branches 'spi/topic/ti-qspi', 'spi/topic/tools', 'spi/topic/txx9' and 'spi/topic/xlp' into spi-next