git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4311ae5
5f151be
)
Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6
author
Tony Lindgren
<tony@atomide.com>
Fri, 10 Apr 2009 19:03:31 +0000
(12:03 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 10 Apr 2009 19:03:31 +0000
(12:03 -0700)
Conflicts:
arch/arm/mach-omap2/board-omap3beagle.c
Trivial merge