diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-04-07 09:21:03 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-04-07 09:21:03 +0200 |
commit | 9bc4341eb79d885e5a9dda6384a60bb0f4655fe7 (patch) | |
tree | 61a1a997b9ea17d5b147fee015f0214f94e9bb3a /drivers | |
parent | dmaengine: shdma: Enable on SH-Mobile ARM (diff) | |
parent | sh: INTC ioremap support (diff) | |
parent | i2c: i2c-sh_mobile kconfig update for SH-Mobile ARM (diff) | |
download | linux-9bc4341eb79d885e5a9dda6384a60bb0f4655fe7.tar.xz linux-9bc4341eb79d885e5a9dda6384a60bb0f4655fe7.zip |
Merge branches 'genesis/dmaengine', 'genesis/intc-extension' and 'genesis/i2c-updates'