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)
Merging in as base to resolve a merge conflict with later soc branch
locally.


Trivial merge