From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 16 Nov 2013 20:45:55 +0000 (-0800)
Subject: Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Tag: v3.13-rc1~55
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=71f777ed50e9109c235c14604d5e23d2f8e7453c;p=linux-2.6-block.git

Merge tag 'fixes-for-linus' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:
 "A first set of batches of fixes for 3.13.  The diffstat is large
  mostly because we're adding a defconfig for a family that's been
  lacking it, and there's some missing clock information added for i.MX
  and OMAP.

  The at91 new code is around dealing with RTC/RTT reset at boot to fix
  possible hangs due to pending wakeup interrupts coming in during early
  boot"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
  ARM: OMAP2+: Fix build for dra7xx without omap4 and 5
  ARM: OMAP2+: omap_device: maintain sane runtime pm status around suspend/resume
  doc: devicetree: Add bindings documentation for omap-des driver
  ARM: dts: doc: Document missing compatible property for omap-sham driver
  ARM: OMAP3: Beagle: fix return value check in beagle_opp_init()
  ARM: at91: fix hanged boot due to early rtt-interrupt
  ARM: at91: fix hanged boot due to early rtc-interrupt
  video: exynos_mipi_dsim: Remove unused variable
  ARM: highbank: only select errata 764369 if SMP
  ARM: sti: only select errata 764369 if SMP
  ARM: tegra: init fuse before setting reset handler
  ARM: vt8500: add defconfig for v6/v7 chips
  ARM: integrator_cp: Set LCD{0,1} enable lines when turning on CLCD
  ARM: OMAP: devicetree: fix SPI node compatible property syntax items
  pinctrl: single: call pcs_soc->rearm() whenever IRQ mask is changed
  ARM: OMAP2+: smsc911x: fix return value check in gpmc_smsc911x_init()
  MAINTAINERS: drop discontinued mailing list
  ARM: dts: i.MX51: Fix OTG PHY clock
  ARM: imx: set up pllv3 POWER and BYPASS sequentially
  ARM: imx: pllv3 needs relock in .set_rate() call
  ...
---

71f777ed50e9109c235c14604d5e23d2f8e7453c
diff --cc arch/arm/mach-highbank/Kconfig
index 08332d841440,6e1d72326454..0aded64a9ebc
--- a/arch/arm/mach-highbank/Kconfig
+++ b/arch/arm/mach-highbank/Kconfig
@@@ -4,12 -4,11 +4,12 @@@ config ARCH_HIGHBAN
  	select ARCH_HAS_CPUFREQ
  	select ARCH_HAS_HOLES_MEMORYMODEL
  	select ARCH_HAS_OPP
 +	select ARCH_SUPPORTS_BIG_ENDIAN
  	select ARCH_WANT_OPTIONAL_GPIOLIB
  	select ARM_AMBA
- 	select ARM_ERRATA_764369
+ 	select ARM_ERRATA_764369 if SMP
  	select ARM_ERRATA_775420
 -	select ARM_ERRATA_798181
 +	select ARM_ERRATA_798181 if SMP
  	select ARM_GIC
  	select ARM_PSCI
  	select ARM_TIMER_SP804