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)
commit16ae66cc33c4ee3a0b3d3bb5d444aefa18134b37
tree199913211021e2998a3fc0eb0eba1a08e7842178
parent96c2ac4cc5beb9c1e3798cb40cf74af093ec60b4
parent324da938cb7eb103a925817f9aacdcc1f0e22576
Merge tag 'sunxi-core-for-3.16' of https://github.com/mripard/linux into next/soc

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>