diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-10-25 21:47:44 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-25 21:47:44 -0400 |
commit | 15893fb565921507da80e500d85bb2575989bb57 (patch) | |
tree | 16473cd98b2b4dd43f55d4880a7b42973f2f6bd0 /init/calibrate.c | |
parent | f32154c9b580f11017b01bf093514c900c09364e (diff) | |
parent | 96987d96f0058d8689a2b8ac288dbff2e6d85563 (diff) |
Merge branch 'sh/sdhi-mfd'
Conflicts:
arch/sh/boards/mach-ecovec24/setup.c
arch/sh/boards/mach-kfr2r09/setup.c
Diffstat (limited to 'init/calibrate.c')
0 files changed, 0 insertions, 0 deletions