git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2f7989e
c9c6fe5
)
Merge branch 'l7200' into devel
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Fri, 16 Jul 2010 10:08:33 +0000
(11:08 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Fri, 16 Jul 2010 10:08:33 +0000
(11:08 +0100)
Conflicts:
arch/arm/configs/lusl7200_defconfig
Trivial merge