From: Olof Johansson <olof@lixom.net>
Date: Sat, 4 Jan 2014 05:43:05 +0000 (-0800)
Subject: Merge tag 'sunxi-core-for-3.14' of https://github.com/mripard/linux into next/drivers
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7bfc397fe76de447ca645edd7453d8ef6ab18279;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge tag 'sunxi-core-for-3.14' of https://github.com/mripard/linux into next/drivers

From Maxime Ripard:
Allwinner core changes for 3.14

This mostly adds the reset controller initialisation for the A31 and the SMP
operations for this SoC.

* tag 'sunxi-core-for-3.14' of https://github.com/mripard/linux:
  ARM: sun6i: Add SMP support for the Allwinner A31
  dt-bindings: fix example of allwinner interrupt controller
  ARM: sunxi: Register the A31 reset IP in init_time
  ARM: sunxi: Select ARCH_HAS_RESET_CONTROLLER

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

7bfc397fe76de447ca645edd7453d8ef6ab18279