tree 960d2b54d3bd7c66af3a4c9c3e61faa981f80bd9
parent fde7d9049e55ab85a390be7f415d74c9f62dd0f9
parent e49d603c181b6004e2f6b5ad6d86daab84f22fe6
author Linus Torvalds <torvalds@linux-foundation.org> 1331617640 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1331617640 -0700
mergetag object e49d603c181b6004e2f6b5ad6d86daab84f22fe6
 type commit
 tag rmobile-for-linus
 tagger Paul Mundt <lethal@linux-sh.org> 1331533564 +0900
 
 SH/R-Mobile fixes for 3.3-rc.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iEYEABECAAYFAk9dlvwACgkQGkmNcg7/o7jooQCgyKYhMoe5mACOy0jI1temge8S
 inUAnRUWKbqKC8c7HDUV5GzbCeps0ccI
 =5hsb
 -----END PGP SIGNATURE-----

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