| commit | b7a40242c82cd73cfcea305f23e67d068dd8401a | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@kernel.org> | Mon Oct 20 17:55:07 2014 +0100 |
| committer | Mark Brown <broonie@kernel.org> | Mon Oct 20 18:27:32 2014 +0100 |
| tree | 251b49d19cd7c371847ae1f951e1b537ca0e1c15 | |
| parent | d26833bfce5e56017bea9f1f50838f20e18e7b7e [diff] | |
| parent | 9c6de47d53a3ce8df1642ae67823688eb98a190a [diff] |
Merge branch 'fix/dw' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-dw Conflicts: drivers/spi/spi-dw-mid.c