diff options
| author | Mark Brown <broonie@kernel.org> | 2017-04-26 15:58:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-04-26 15:58:22 +0100 |
| commit | 282ec0ea65dab88fda51b5b9b649958ae42f4ac0 (patch) | |
| tree | 6248eb4ec9f5da24d496afa55db4fa491f0e6295 /include/linux/lockd/xdr.h | |
| parent | d8f520727f769164fa6ff0ad4a4d965336966999 (diff) | |
| parent | c687c46e9e4527c4b4d82bc3cca58c1b08bcfb83 (diff) | |
| parent | 251831bd4f4903415da7f0ce04dc0de26bc43f1d (diff) | |
Merge remote-tracking branches 'spi/topic/ti-qspi' and 'spi/topic/xlp' into spi-next