tree 153ecf3842bcaf36ecac4f0c2b008fa3b7485488
parent 8ad0bbd8696904c34a1fb266a25efe2be818c0c7
parent 5e669ec583e2687d3512d965cf2e209095f70c62
author Arnd Bergmann <arnd@arndb.de> 1400873628 +0200
committer Arnd Bergmann <arnd@arndb.de> 1400875043 +0200

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 <arnd@arndb.de>