This repository has been archived on 2026-03-14. You can view files and clone it, but cannot push or open issues or pull requests.

Arnd Bergmann b2f1df8d2f 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>

2012-03-20 09:41:43 +00:00

..

asm

Merge branch 'renesas/timer' into next/timer

2012-03-20 09:41:43 +00:00