diff options
author | Mark Brown | 2016-09-30 09:14:10 -0700 |
---|---|---|
committer | Mark Brown | 2016-09-30 09:14:10 -0700 |
commit | e2df04ed3be123fb53740303779e13748b9f8b65 (patch) | |
tree | 7aae6aad60fdd661691d854a144499736bdbd8f4 /drivers/spi/Makefile | |
parent | a931a189d4f661d1a23010e40c528c0170a1d9b2 (diff) | |
parent | 604042af7697314fffb16e266fd7d5ad488439cc (diff) | |
parent | 446576f9ea5308c671eafb1cdc2a977b406c1dc5 (diff) | |
parent | f75529fd712cb147a81925c58cf260346eae5da3 (diff) | |
parent | dc34b89a8c611946bfa18ddc322d355e97811f01 (diff) | |
parent | 2f58ea64bd8931bd7709732fe0a96e0bfb44a00b (diff) |
Merge remote-tracking branches 'spi/topic/fsl-espi', 'spi/topic/imx', 'spi/topic/jcore', 'spi/topic/loopback' and 'spi/topic/meson' into spi-next