diff options
author | Mark Brown <broonie@kernel.org> | 2016-12-12 15:54:09 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-12-12 15:54:09 +0000 |
commit | 3bc1ad252d4f740a7600ded3bf7bee16043f052d (patch) | |
tree | 43d6def0e4ea3e2f7923e9b7d146dad07850ed75 /drivers/spi/spi-fsl-dspi.c | |
parent | 0afa0724dfb0ee94bc1c85eee9e90318413af463 (diff) | |
parent | 8244bd3ab405a1268223a282b32d28031f7e16fe (diff) | |
parent | 80b444e57948ea4bd5a89fb1f8c404ddab6c1973 (diff) | |
parent | ccf7d8ee3d6eb600338a184e9a192ec1d5aee924 (diff) | |
parent | 7e2ef003302cc797917ce0a2a32cffb4af42c99e (diff) |
Merge remote-tracking branches 'spi/topic/delay', 'spi/topic/dw', 'spi/topic/fsl-dspi' and 'spi/topic/fsl-espi' into spi-next