From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 Mar 2012 05:47:20 +0000 (-0700)
Subject: Merge tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a10a854365503ad5e374b3cd48f06aa486df7211;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh

Pull SH/R-Mobile fixes from Paul Mundt.

* tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh:
  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
---

a10a854365503ad5e374b3cd48f06aa486df7211