diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-10-26 10:47:44 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-26 10:47:44 +0900 |
| commit | 15893fb565921507da80e500d85bb2575989bb57 (patch) | |
| tree | 16473cd98b2b4dd43f55d4880a7b42973f2f6bd0 /.gitignore | |
| parent | f32154c9b580f11017b01bf093514c900c09364e (diff) | |
| parent | 96987d96f0058d8689a2b8ac288dbff2e6d85563 (diff) | |
| download | blackbird-op-linux-15893fb565921507da80e500d85bb2575989bb57.tar.gz blackbird-op-linux-15893fb565921507da80e500d85bb2575989bb57.zip | |
Merge branch 'sh/sdhi-mfd'
Conflicts:
arch/sh/boards/mach-ecovec24/setup.c
arch/sh/boards/mach-kfr2r09/setup.c
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions
