]> 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)
commitbdcfefc104338c5fc5f09bff638f2fb7376cd2aa
tree34150d2e7ac4eb6c00f4bc96991947f71a338a0d
parente7232253baf1a09a8bafb1e9bdccaffb211e8f31
parentb707368bc36f0388ac3fc53f46095f20776bbfe2
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