]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fix/fsl-dspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Tue, 7 Apr 2015 10:54:40 +0000 (11:54 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 7 Apr 2015 10:54:40 +0000 (11:54 +0100)
commit0f25224385d946204b154c850461b2e3edb0b8e6
tree34150d2e7ac4eb6c00f4bc96991947f71a338a0d
parentda10b02e7799d5a1a2e27b1fe8c1b76546e37d1a
parent428f3374c3588e3e09ea40b29c6183a6038783ec
Merge branch 'fix/fsl-dspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-fsl-dspi

Conflicts:
drivers/spi/spi-fsl-dspi.c
drivers/spi/spi-fsl-dspi.c