tree 47d9f2d94862f7b7c0bc952af41631dfaa220ead
parent f35b431dde39fb40944d1024f08d88fbf04a3193
parent a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13
author Olof Johansson <olof@lixom.net> 1330888598 -0800
committer Olof Johansson <olof@lixom.net> 1330888598 -0800

Merge branch 'depends/rmk/for-armsoc' into for-3.4/cleanup-and-fixes