git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fc1caf6
a6cd7eb
)
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Fri, 6 Aug 2010 17:10:25 +0000
(18:10 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Fri, 6 Aug 2010 17:10:25 +0000
(18:10 +0100)
Conflicts:
arch/arm/mach-pxa/palmt5.c
arch/arm/mach-pxa/palmtreo.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff