Merge tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh
commit37e79cbf7d45451fb4d1213184e484723c25c65a
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Feb 2012 16:57:22 +0000 (24 08:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Feb 2012 16:57:22 +0000 (24 08:57 -0800)
tree6a1ef497215365ec25c367d87feca3712ad66cb3
parent0e69e084017f015555ae584972386296c8c1bf1c
parent7372a4cd6c6fe07ae9d7d0340717736fba863580
Merge tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh

SH/R-Mobile fixes for 3.3-rc5

* tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh:
  arch/arm/mach-shmobile/board-ag5evm.c: included linux/dma-mapping.h twice
  ARM: mach-shmobile: r8a7779 PFC IPSR4 fix
  ARM: mach-shmobile: sh73a0 PSTR 32-bit access fix
  ARM: mach-shmobile: add GPIO-to-IRQ translation to sh7372
  ARM: mach-shmobile: clock-sh73a0: add DSIxPHY clock support
  arm: fix compile failure in mach-shmobile/board-ag5evm.c
  ARM: mach-shmobile: mackerel: add ak4642 amixer settings on comment
  ARM: mach-shmobile: mackerel: use renesas_usbhs instead of r8a66597_hcd
  ARM: mach-shmobile: simplify MMCIF DMA configuration
  ARM: mach-shmobile: IRQ driven GPIO key support for Kota2
  ARM: mach-shmobile: sh73a0 IRQ sparse alloc fix
  ARM: mach-shmobile: sh73a0 PINT IRQ base fix