| commit | b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Mar 19 20:46:32 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Tue Mar 20 09:41:43 2012 +0000 |
| tree | 065282434bde6ef9b4357c042705c5fcef3782ea | |
| parent | c0206e228e34d8b414fcc63db45b831843adea06 [diff] | |
| parent | 5cd9eb2736a572a9ef2689829f47ffd4262adc00 [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>