Merge branch 'renesas/cleanup2' into next/soc
authorOlof Johansson <olof@lixom.net>
Sat, 12 Jul 2014 16:43:40 +0000 (09:43 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 12 Jul 2014 16:43:40 +0000 (09:43 -0700)
commite1ddcdef841f68d175b1a4a5c91d55f383ce5241
tree69122e47ea903b99c5e7a6c871deb7717663bf5f
parentedf4f16f2709abcce37f10ac0c64d06d540ed6b2
parent113522ee3034427472bcb4b8665833719809b31a
Merge branch 'renesas/cleanup2' into next/soc

Merging in as base to resolve a merge conflict with later soc branch
locally.
arch/arm/mach-shmobile/setup-r8a7790.c
arch/arm/mach-shmobile/smp-r8a7790.c