Merge tag 'sunxi-core-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Sat, 19 Jul 2014 19:22:47 +0000 (12:22 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 19 Jul 2014 19:22:47 +0000 (12:22 -0700)
commit7b2a428a33411dd9d79ee836b6e72fad2dbbb365
treec2b11f6d0e6dac7dce21ad4f9c593a712dc29c8b
parentb40abaf07fa19c5aa3e649369ed8e0f9df1d2eda
parent5ba1657ecdee507df4adcd05b533d09e9934fc11
Merge tag 'sunxi-core-for-3.17' of git://git./linux/kernel/git/mripard/linux into next/soc

Merge "Allwinner core additions for 3.17" from Maxime Ripard:

Nothing very fancy here, only the introduction from the new Allwinner A23 SoC.

* tag 'sunxi-core-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi: select MFD_SUN6I_PRCM when sun8i arch support is enabled
  ARM: sunxi: Add earlyprintk support using R_UART (sun6i/sun8i)
  ARM: sunxi: Introduce Allwinner A23 support

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