diff options
| author | Mark Brown <broonie@kernel.org> | 2015-07-24 16:19:50 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-07-24 16:19:50 +0100 |
| commit | 0c38ec716cdc0397f5225047c33a3144da93f5d8 (patch) | |
| tree | aab8862932d26b9b382f8fb372348bec1b1819d0 /drivers/pwm/pwm-fsl-ftm.c | |
| parent | 52721d9d3334c1cb1f76219a161084094ec634dc (diff) | |
| parent | 861a481c5ede75bf31bc118f1f7f6d1f420182b5 (diff) | |
| parent | f6ee9b582d2db652497b73c1f117591dfb6d3a90 (diff) | |
| parent | 6a806a214af42ac951e2d85e64d1bf4463482e16 (diff) | |
| parent | 6fec919b61b66e7f92646a7bd6fada9850f5cedc (diff) | |
Merge remote-tracking branches 'spi/fix/gqspi', 'spi/fix/imx', 'spi/fix/mg-spfi' and 'spi/fix/spidev' into spi-linus