From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 15 Mar 2012 18:27:15 +0000 (+0000)
Subject: Merge branch 'renesas/soc' into next/soc
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=62a16d025c683fe9e1eada7683095013b96ce9d1;p=linux-beck.git

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

62a16d025c683fe9e1eada7683095013b96ce9d1