git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 05d9881 4da3782)
Merge branch 'omap-clks3' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 19 Mar 2009 12:39:58 +0000 (12:39 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 19 Mar 2009 12:39:58 +0000 (12:39 +0000)
Conflicts:

arch/arm/mach-omap2/clock.c


Trivial merge
Pandora Kernel Repository