Merge branch 'master' of https://github.com/m-labs/misoc
authorSebastien Bourdeauducq <sb@m-labs.hk>
Fri, 27 Mar 2015 18:22:29 +0000 (19:22 +0100)
committerSebastien Bourdeauducq <sb@m-labs.hk>
Fri, 27 Mar 2015 18:22:29 +0000 (19:22 +0100)

Trivial merge