diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2011-01-05 17:25:29 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-05 17:25:29 +0900 |
| commit | 025a10a76808cfd9e55dbf965d0f1453e4f8ae84 (patch) | |
| tree | 32f4f73efad9559b4fb83628e4f65d2c6bc062e3 /tools/perf/scripts/python/netdev-times.py | |
| parent | ARM: mach-shmobile: Add eMMC support through MMCIF on AG5EVM (diff) | |
| parent | mmc: sh_mmcif: make DMA support by the driver unconditional (diff) | |
| parent | ARM: mach-shmobile: sh73a0: fix div4 table (diff) | |
| parent | ARM: mach-shmobile: ap4/mackerel: modify wrong comment out of USB (diff) | |
Merge branches 'rmobile/mmcif', 'rmobile/ag5' and 'rmobile/mackerel' into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Kconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>