| commit | 62a16d025c683fe9e1eada7683095013b96ce9d1 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Thu Mar 15 18:27:15 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Thu Mar 15 18:27:15 2012 +0000 |
| tree | 76713c2793cf5c3b72edd747417760b893c8b8ca | |
| parent | ae0b82504e515fdb9bc23c0b770d2b30efd49dc9 [diff] | |
| parent | 5cd9eb2736a572a9ef2689829f47ffd4262adc00 [diff] |
Merge branch 'renesas/soc' into next/soc * renesas/soc: ARM: mach-shmobile: ap4evb: fixup fsi2_ak4643_info typo ARM: mach-shmobile: mackerel: Reserve DMA memory for the frame buffer ARM: mach-shmobile: Fix ag5evm compilation by including linux/videodev2.h ARM: mach-shmobile: Fix bonito compile breakage