From: Olof Johansson <olof@lixom.net>
Date: Tue, 29 Jan 2013 17:09:39 +0000 (-0800)
Subject: Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas... 
X-Git-Tag: v3.9-rc1~118^2~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0475e57fc392484b1f39f3f757b8ad5314964eb4;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'soc' of git://git./linux/kernel/git/horms/renesas into next/soc

From Simon Horman, a series of SoC updates for shmobile.

* 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7779: scif .irqs used SCIx_IRQ_MUXED()
  ARM: mach-shmobile: sh73a0: Initialise MMCIF using DT
  ARM: mach-shmobile: sh73a0: Minimal setup using DT
  ARM: mach-shmobile: sh73a0: Allow initialisation of GIC by DT
  ARM: SH-Mobile: sh73a0: Add CPU Hotplug
  ARM: SH-Mobile: sh73a0: Secondary CPUs handle own SCU flags
  ARM: shmobile: r8a7740: Add CPU sleep suspend
  ARM: shmobile: sh73a0: Add CPU sleep suspend
  ARM: shmobile: add function declarations for sh7372 DT helper functions
  ARM: sh7372: fix cache clean / invalidate order
  ARM: sh7372: add clock lookup entries for DT-based devices
  ARM: mach-shmobile: sh73a0 external IRQ wake update
  ARM: shmobile: sh73a0: fixup div4_clks bitmap
  ARM: shmobile: r8a7740: add TMU timer support
  ARM: shmobile: Remove duplicate inclusion of dma-mapping.h in setup-r8a7740.c

Signed-off-by: Olof Johansson <olof@lixom.net>

Fix trivial conflict in board_bcm due to Simon resolving the same conflict
with one less line of whitespace. Keeping end result common with what
we already have in arm-soc.

Conflicts:
	arch/arm/mach-bcm/board_bcm.c
---

0475e57fc392484b1f39f3f757b8ad5314964eb4