OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
95bf15f
e689d6d
)
Merge branch 'fix/fsl-dspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
author
Mark Brown
<broonie@kernel.org>
Tue, 7 Apr 2015 10:54:40 +0000
(11:54 +0100)
committer
Mark Brown
<broonie@kernel.org>
Tue, 7 Apr 2015 10:54:40 +0000
(11:54 +0100)
Conflicts:
drivers/spi/spi-fsl-dspi.c
1
2
drivers/spi/spi-fsl-dspi.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/spi/spi-fsl-dspi.c
Simple merge