diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-04-07 11:21:03 +0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-04-07 11:21:03 +0400 |
| commit | 9bc4341eb79d885e5a9dda6384a60bb0f4655fe7 (patch) | |
| tree | 61a1a997b9ea17d5b147fee015f0214f94e9bb3a /drivers/dma/shdma.c | |
| parent | 927a7c9c1793def3a55d60c926d3945528e6bf1b (diff) | |
| parent | dec710b77c2cf04bf512acada3c14a16f11708d9 (diff) | |
| parent | 0924fada1e64f92dd89818cf3a15571cc515afd8 (diff) | |
| download | linux-9bc4341eb79d885e5a9dda6384a60bb0f4655fe7.tar.xz | |
Merge branches 'genesis/dmaengine', 'genesis/intc-extension' and 'genesis/i2c-updates'