OSDN Git Service

(root) / uclinux-h8 / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 95bf15f e689d6d)
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)
commit63031ed6b8bd69d4baff6a46f5c9b79b51bd1eaa
tree34150d2e7ac4eb6c00f4bc96991947f71a338a0dtree | snapshot
parent95bf15f386417f3ba80bb860c1385b1ebfdcdffacommit | diff
parente689d6df8257f92abf59e93736632b79c9b2aa66commit | diff
Merge branch 'fix/fsl-dspi' of git://git./linux/kernel/git/broonie/spi into spi-fsl-dspi

Conflicts:
drivers/spi/spi-fsl-dspi.c
drivers/spi/spi-fsl-dspi.c diff1 | diff2 | blob | history
About OSDN
Find Software
Develop Software
Help