git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28cdac6 1051b9f)
Merge branch 'devel-stable' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 6 Jan 2011 22:33:32 +0000 (22:33 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 6 Jan 2011 22:33:32 +0000 (22:33 +0000)
Conflicts:
arch/arm/mach-pxa/clock.c
arch/arm/mach-pxa/clock.h


Trivial merge
Pandora Kernel Repository