From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Jun 2011 16:46:08 +0000 (-0700)
Subject: Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~3680^2~5238
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f49cc57cc9d1686bdca068c40bc43f1690aa02d3;p=firefly-linux-kernel-4.4.55.git

Merge branch 'rmobile-fixes-for-linus' of git://git./linux/kernel/git/lethal/sh-3.x

* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x:
  ARM: mach-shmobile: mackerel: tidyup usbhs driver settings
  ARM: mach-shmobile: Correct SCIF port types for SH7367.
  ARM: mach-shmobile: sh73a0 gic_arch_extn.irq_set_wake() fix
  ARM: mach-shmobile: Mackerel USB platform data update
  ARM: mach-shmobile: AG5EVM SDHI1 platform data update
---

f49cc57cc9d1686bdca068c40bc43f1690aa02d3