git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
aa312be
0af85dd
)
Merge branch 'clksrc' into devel
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Wed, 5 Jan 2011 18:09:03 +0000
(18:09 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Wed, 5 Jan 2011 18:09:03 +0000
(18:09 +0000)
Conflicts:
arch/arm/mach-vexpress/v2m.c
arch/arm/plat-omap/counter_32k.c
arch/arm/plat-versatile/Makefile
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff