git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3110628
6d40530
)
Merge remote-tracking branch 'spi/fix/msiof' into spi-sh-msiof
author
Mark Brown
<broonie@kernel.org>
Tue, 6 Jan 2015 11:06:46 +0000
(11:06 +0000)
committer
Mark Brown
<broonie@kernel.org>
Tue, 6 Jan 2015 11:06:46 +0000
(11:06 +0000)
Conflicts:
drivers/spi/spi-sh-msiof.c
1
2
drivers/spi/spi-sh-msiof.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/spi/spi-sh-msiof.c
Simple merge