Merge tag 'sunxi-core-for-3.14' of https://github.com/mripard/linux into next/drivers
authorOlof Johansson <olof@lixom.net>
Sat, 4 Jan 2014 05:43:05 +0000 (21:43 -0800)
committerOlof Johansson <olof@lixom.net>
Sat, 4 Jan 2014 05:43:05 +0000 (21:43 -0800)
commit7bfc397fe76de447ca645edd7453d8ef6ab18279
tree1f3f7b5ca66ca76d46a4ad8b86fd279b7fd3b8d3
parenta7dedb4fead89f88255862a9bc46f4c7ec094c2e
parent73346794b48237b7b4c2a5c02b12e3c4f1da7551
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>