git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9e3288d
b37fa16
)
Merge commit 'v2.6.35-rc6' into devicetree/next
author
Grant Likely
<grant.likely@secretlab.ca>
Sat, 24 Jul 2010 15:49:13 +0000
(09:49 -0600)
committer
Grant Likely
<grant.likely@secretlab.ca>
Sat, 24 Jul 2010 15:49:13 +0000
(09:49 -0600)
Conflicts:
arch/sparc/kernel/prom_64.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff