Files
odroid-linux/arch/arm/kernel
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
..
2008-08-12 19:54:09 +01:00
2008-05-30 10:33:49 +02:00
2010-10-29 13:14:40 -05:00