]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'fix/dw' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi...
authorMark Brown <broonie@kernel.org>
Mon, 20 Oct 2014 16:55:07 +0000 (17:55 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 20 Oct 2014 17:27:32 +0000 (18:27 +0100)
commitb7a40242c82cd73cfcea305f23e67d068dd8401a
tree251b49d19cd7c371847ae1f951e1b537ca0e1c15
parentd26833bfce5e56017bea9f1f50838f20e18e7b7e
parent9c6de47d53a3ce8df1642ae67823688eb98a190a
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