Merge tag 'sunxi-core-for-3.14-2' of https://github.com/mripard/linux into next/soc
authorKevin Hilman <khilman@linaro.org>
Tue, 14 Jan 2014 23:23:00 +0000 (15:23 -0800)
committerKevin Hilman <khilman@linaro.org>
Tue, 14 Jan 2014 23:25:32 +0000 (15:25 -0800)
commit3e0a79695cf8600322c519b33df76b8bc2f1aaca
tree322c96e36f819368150ccfc154f97f353abf6948
parenteb90217750136e4712f1d87a33e1951b80a1a365
parent75cac6abe756fde529a000e725dceed2b908f61a
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 <khilman@linaro.org>
MAINTAINERS
This page took 0.025341 seconds and 5 git commands to generate.