From: Arnd Bergmann Date: Fri, 23 May 2014 19:33:48 +0000 (+0200) Subject: Merge tag 'sunxi-core-for-3.16-2' of https://github.com/mripard/linux into next/soc X-Git-Tag: firefly_0821_release~176^2~3781^2~5 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3c2580173e3bc820a8f8c0db968f757b8eca7fe5;p=firefly-linux-kernel-4.4.55.git Merge tag 'sunxi-core-for-3.16-2' of https://github.com/mripard/linux into next/soc Merge "Allwinner Core additions for 3.16, take 2" from Maxime Ripard: - Convert the A31 SMP operations to the CPU_METHOD_OF_DECLARE mechanism - Remove the reset code from the machine definition, that removes pretty much all the code left in mach-sunxi * tag 'sunxi-core-for-3.16-2' of https://github.com/mripard/linux: ARM: sunxi: Remove init_machine callback ARM: sunxi: Remove reset code from the platform ARM: sun6i: Retire the smp field in A31 machine Documentation: dt: bindings: Document Allwinner A31 enable method ARM: sun6i: Use CPU_METHOD_OF_DECLARE Documentation: dt: bindings: Document ARM PSCI enable method Signed-off-by: Arnd Bergmann --- 3c2580173e3bc820a8f8c0db968f757b8eca7fe5