diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-10-26 02:47:44 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-26 02:47:44 +0100 |
| commit | 15893fb565921507da80e500d85bb2575989bb57 (patch) | |
| tree | 16473cd98b2b4dd43f55d4880a7b42973f2f6bd0 /drivers/net/wan/hdlc_cisco.c | |
| parent | sh: Add dma-mapping support for dma_alloc/free_coherent() overrides. (diff) | |
| parent | sh: mach-ecevec24: Add SDHI support (diff) | |
| download | linux-15893fb565921507da80e500d85bb2575989bb57.tar.xz 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 'drivers/net/wan/hdlc_cisco.c')
0 files changed, 0 insertions, 0 deletions