From: Kevin Hilman Date: Tue, 14 Jan 2014 23:23:00 +0000 (-0800) Subject: Merge tag 'sunxi-core-for-3.14-2' of https://github.com/mripard/linux into next/soc X-Git-Tag: v3.14-rc1~113^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e0a79695cf8600322c519b33df76b8bc2f1aaca;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge tag 'sunxi-core-for-3.14-2' of https://github.com/mripard/linux into next/soc From Maxime Ripard: Second round of core additions for the Allwinner SoCs Fixes to select missing configuration options, and update of the maintainer file. * tag 'sunxi-core-for-3.14-2' of https://github.com/mripard/linux: ARM: sunxi: select ARM_PSCI MAINTAINERS: Update Allwinner sunXi maintainer files ARM: sunxi: Select RESET_CONTROLLER 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 reset: Add Allwinner SoCs Reset Controller Driver Signed-off-by: Kevin Hilman --- 3e0a79695cf8600322c519b33df76b8bc2f1aaca