projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitb2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc
tree065282434bde6ef9b4357c042705c5fcef3782eatree | snapshot
parentc0206e228e34d8b414fcc63db45b831843adea06commit | diff
parent5cd9eb2736a572a9ef2689829f47ffd4262adc00commit | diff
Merge branch 'renesas/timer' into next/timer

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>
arch/arm/kernel/smp_twd.c diff1 | diff2 | blob | history
arch/arm/mach-shmobile/include/mach/common.h diff1 | diff2 | blob | history
arch/arm/mach-shmobile/smp-sh73a0.c diff1 | diff2 | blob | history
arch/arm/mach-shmobile/timer.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.