diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 18:27:15 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 18:27:15 +0000 |
| commit | 62a16d025c683fe9e1eada7683095013b96ce9d1 (patch) | |
| tree | 76713c2793cf5c3b72edd747417760b893c8b8ca /crypto/cast5.c | |
| parent | ae0b82504e515fdb9bc23c0b770d2b30efd49dc9 (diff) | |
| parent | 5cd9eb2736a572a9ef2689829f47ffd4262adc00 (diff) | |
| download | blackbird-op-linux-62a16d025c683fe9e1eada7683095013b96ce9d1.tar.gz blackbird-op-linux-62a16d025c683fe9e1eada7683095013b96ce9d1.zip | |
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
Diffstat (limited to 'crypto/cast5.c')
0 files changed, 0 insertions, 0 deletions
