diff options
| author | Mark Brown <broonie@kernel.org> | 2017-11-10 21:33:40 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-11-10 21:33:40 +0000 |
| commit | 130555cf3b13ad9e187f52a2a3780af9d3b8714c (patch) | |
| tree | d4a15bd1e398d8122544d91636896fcdcba6ad6f /drivers/nfc/nxp-nci/Makefile | |
| parent | 39dae59d66acd86d1de24294bd2f343fd5e7a625 (diff) | |
| parent | 42bdd7061a6e24d7b21d3d21973615fecef544ef (diff) | |
| parent | 36735783fdb599c94b9c86824583df367c65900b (diff) | |
| download | linux-130555cf3b13ad9e187f52a2a3780af9d3b8714c.tar.bz2 | |
Merge remote-tracking branches 'spi/fix/idr' and 'spi/fix/sh-msiof' into spi-linus