Merge branch 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas...
authorOlof Johansson <olof@lixom.net>
Sun, 13 May 2012 04:22:28 +0000 (21:22 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 13 May 2012 04:22:28 +0000 (21:22 -0700)
* 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas:
  ARM: mach-shmobile: bonito: make sure static function
  ARM: mach-shmobile: sh7372 CEU supports up to 8188x8188 images
  ARM: mach-shmobile: mackerel: Add FSI DMAEngine support


Trivial merge