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)
* 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


Trivial merge