Merge branch 'master' of https://github.com/m-labs/misoc
authorSebastien Bourdeauducq <sb@m-labs.hk>
Wed, 4 Mar 2015 00:46:41 +0000 (00:46 +0000)
committerSebastien Bourdeauducq <sb@m-labs.hk>
Wed, 4 Mar 2015 00:46:41 +0000 (00:46 +0000)

Trivial merge