Merge tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Mar 2012 05:47:20 +0000 (22:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Mar 2012 05:47:20 +0000 (22:47 -0700)
commita10a854365503ad5e374b3cd48f06aa486df7211
tree960d2b54d3bd7c66af3a4c9c3e61faa981f80bd9
parentfde7d9049e55ab85a390be7f415d74c9f62dd0f9
parente49d603c181b6004e2f6b5ad6d86daab84f22fe6
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