]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/soc' into for-next
authorKevin Hilman <khilman@linaro.org>
Tue, 14 Jan 2014 23:26:17 +0000 (15:26 -0800)
committerKevin Hilman <khilman@linaro.org>
Tue, 14 Jan 2014 23:28:53 +0000 (15:28 -0800)
commit104bdee46b117dc5b5d198ff0241fb99e6853c86
tree43daebe1a635f455d2d7ad7ec4eb553865887413
parent7d464b912bdddc45a7c5457c3bb52e94ad285245
parent3e0a79695cf8600322c519b33df76b8bc2f1aaca
Merge branch 'next/soc' into for-next

* next/soc:
  ARM: sunxi: select ARM_PSCI
  MAINTAINERS: Update Allwinner sunXi maintainer files
  ARM: sunxi: Select RESET_CONTROLLER

Signed-off-by: Kevin Hilman <khilman@linaro.org>
MAINTAINERS
arch/arm/arm-soc-for-next-contents.txt