summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-07-12 09:43:40 -0700
committerOlof Johansson <olof@lixom.net>2014-07-12 09:43:40 -0700
commite1ddcdef841f68d175b1a4a5c91d55f383ce5241 (patch)
tree69122e47ea903b99c5e7a6c871deb7717663bf5f /Documentation
parentedf4f16f2709abcce37f10ac0c64d06d540ed6b2 (diff)
parent113522ee3034427472bcb4b8665833719809b31a (diff)
Merge branch 'renesas/cleanup2' into next/soc
Merging in as base to resolve a merge conflict with later soc branch locally.
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions