Merge tag 'mvebu-soc-3.17-2' of git://git.infradead.org/linux-mvebu into next/soc
authorOlof Johansson <olof@lixom.net>
Sat, 19 Jul 2014 21:28:06 +0000 (14:28 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 19 Jul 2014 21:28:06 +0000 (14:28 -0700)
commit4338925434e4bf5ff714055713f3fb9b5fae9037
tree2c764e61af011f71b97c1d4b5113b47265d3e03d
parent7b2a428a33411dd9d79ee836b6e72fad2dbbb365
parentba364fc752daeded072a5ef31e43b84cb1f9e5fd
Merge tag 'mvebu-soc-3.17-2' of git://git.infradead.org/linux-mvebu into next/soc

Merge "ARM: mvebu SoC changes for v3.17 (round 2)" from Jason Cooper:

"Yeah, it's just one patch, but it's a beautiful one!  Thanks to the
efforts of many people over the last couple years, and in particular,
Andrew Lunn, Kirkwood has been completely converted to DT."

 - kirkwood
   * Remove mach-kirkwood/, It's fully supported in mach-mvebu/

* tag 'mvebu-soc-3.17-2' of git://git.infradead.org/linux-mvebu:
  ARM: Kirkwood: Remove mach-kirkwood

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/boot/dts/Makefile
arch/arm/mm/Kconfig