git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dcd6c92
b97b662
)
Merge branch 'spi/s3c64xx' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
author
Grant Likely
<grant.likely@secretlab.ca>
Mon, 30 Jan 2012 15:32:37 +0000
(08:32 -0700)
committer
Grant Likely
<grant.likely@secretlab.ca>
Mon, 30 Jan 2012 15:32:37 +0000
(08:32 -0700)
Conflicts:
drivers/spi/spi-s3c64xx.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff