]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'sunxi-core-for-3.16' of https://github.com/mripard/linux into next/soc
authorOlof Johansson <olof@lixom.net>
Wed, 21 May 2014 21:35:04 +0000 (14:35 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 21 May 2014 21:35:04 +0000 (14:35 -0700)
Merge "Allwinner SoCs core additions for 3.16" from Maxime Ripard:

Refactor the Kconfig options to have one Kconfig option per machine.

* tag 'sunxi-core-for-3.16' of https://github.com/mripard/linux:
  ARM: sunxi: select MFD_SUN6I_PRCM when sun6i arch support is enabled
  ARM: sunxi: Split the various SoCs support in Kconfig

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge