git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6451d77
8939b35
)
Merge branch 'davinci-next' into davinci-for-linus
author
Kevin Hilman
<khilman@deeprootsystems.com>
Thu, 21 Oct 2010 18:21:55 +0000
(11:21 -0700)
committer
Kevin Hilman
<khilman@deeprootsystems.com>
Thu, 21 Oct 2010 18:21:55 +0000
(11:21 -0700)
Conflicts:
arch/arm/mach-davinci/board-da830-evm.c
arch/arm/mach-davinci/board-da850-evm.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff