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)
Conflicts:
drivers/spi/spi-dw-mid.c


Trivial merge