git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0206e2 5cd9eb2)
Merge branch 'renesas/timer' into next/timer
authorArnd Bergmann <arnd@arndb.de>
Mon, 19 Mar 2012 20:46:32 +0000 (20:46 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 20 Mar 2012 09:41:43 +0000 (09:41 +0000)
Conflicts:
arch/arm/mach-shmobile/timer.c

This resolves a nonobvious merge conflict between renesas
timer changes in the global timer changes with those
from the renesas soc branch and last minute bug fixes that
went into v3.3.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge
Pandora Kernel Repository