Merge branch 'next/soc' into next/dt
authorOlof Johansson <olof@lixom.net>
Tue, 5 Feb 2013 21:19:03 +0000 (13:19 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 5 Feb 2013 21:19:03 +0000 (13:19 -0800)
commit0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7
treea91d4934ac4ffda651804b30554bb6da5af572d4
parentf015941f6b4a7d4d90c46a65bca17f2c2c41fb89
parentf7c66dc0bf0f4ecd349c79315c87841c67e27aef
Merge branch 'next/soc' into next/dt
arch/arm/Kconfig
arch/arm/boot/dts/Makefile