Merge branch 'renesas/soc' into next/soc
authorArnd Bergmann <arnd@arndb.de>
Thu, 15 Mar 2012 18:27:15 +0000 (18:27 +0000)
committerArnd Bergmann <arnd@arndb.de>
Thu, 15 Mar 2012 18:27:15 +0000 (18:27 +0000)
commit62a16d025c683fe9e1eada7683095013b96ce9d1
tree76713c2793cf5c3b72edd747417760b893c8b8ca
parentae0b82504e515fdb9bc23c0b770d2b30efd49dc9
parent5cd9eb2736a572a9ef2689829f47ffd4262adc00
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