From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 19 Mar 2012 20:46:32 +0000 (+0000)
Subject: Merge branch 'renesas/timer' into next/timer
X-Git-Tag: v3.4-rc1~90^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc;p=pandora-kernel.git

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>
---

b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc
Reading git-diff-tree failed