diff options
| author | Mark Brown <broonie@kernel.org> | 2015-10-07 11:43:39 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-10-07 11:43:39 +0100 |
| commit | c2c80bdb9e91b412ea68f6dcc49c5d7b91e0b930 (patch) | |
| tree | 4e87abf632823d52cf71e8f26bf8b5083ffd2ec4 | |
| parent | 049e6dde7e57f0054fdc49102e7ef4830c698b46 (diff) | |
| parent | 8494cdea2223b66491df1264619e2205b4487913 (diff) | |
| parent | eb8d0ac4afd8b15ac88f8a50342b32774ff881ed (diff) | |
| download | linux-c2c80bdb9e91b412ea68f6dcc49c5d7b91e0b930.tar.bz2 | |
Merge remote-tracking branches 'spi/fix/davinci' and 'spi/fix/sh-msiof' into spi-linus