diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 17:26:43 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 17:33:38 +0000 |
| commit | 5cd9eb2736a572a9ef2689829f47ffd4262adc00 (patch) | |
| tree | 380bcc1d77acc968e9ae9c8da9215b8b04edba1f /arch/arm/mach-shmobile/timer.c | |
| parent | a6e24019468009a21b674e392d74283a90f415dd (diff) | |
| parent | e49d603c181b6004e2f6b5ad6d86daab84f22fe6 (diff) | |
Merge branch 'renesas/fixes' into renesas/soc
The fixes branch was merged into mainline just after v3.3-rc7,
I'm merging it into this branch to fix up a nontrivial merge
conflict. Unfortunately this means that we are now based on
a commit between -rc releases, which we normally try to avoid.
Conflicts:
arch/arm/mach-shmobile/board-mackerel.c
Resolution suggested by Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-shmobile/timer.c')
0 files changed, 0 insertions, 0 deletions