diff options
author | Mark Brown | 2015-02-08 11:16:43 +0800 |
---|---|---|
committer | Mark Brown | 2015-02-08 11:16:43 +0800 |
commit | fab4b42a9a3dbe14dc1d058bfd6301d644661e20 (patch) | |
tree | 04d3525d64c4a4b86eac2583c8e16046d455b0e1 | |
parent | 81306d53da7efde6fa17c04700b8782e08006e80 (diff) | |
parent | 1369dea6496f10d536bcd8282bb21a1b982a912e (diff) | |
parent | 78d97a5736d1c03d9c2e5cf7804d49599decb90d (diff) | |
parent | 2b5e368e4195749e50188dca4394ac8d25ff39f2 (diff) | |
parent | d9c14743a330315b6e2186cafc4812fe91a1fa8f (diff) |
Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/config', 'spi/topic/dln2' and 'spi/topic/dw' into spi-next