git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7b967b b6e3b5c)
Merge branch 'next/soc' into HEAD
authorOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:19:17 +0000 (14:19 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:19:17 +0000 (14:19 -0700)
Conflicts:
arch/arm/mach-ux500/clock.c
arch/arm/mach-ux500/cpu.c
drivers/clocksource/Makefile


Trivial merge
Pandora Kernel Repository