Merge branch 'master' of https://github.com/m-labs/misoc
authorSebastien Bourdeauducq <sb@m-labs.hk>
Tue, 26 May 2015 05:57:26 +0000 (13:57 +0800)
committerSebastien Bourdeauducq <sb@m-labs.hk>
Tue, 26 May 2015 05:57:26 +0000 (13:57 +0800)
commit1e47cfce2bcabf1a2d53b5d211fb1734db2c09c3
tree72acedb9225ba2b0f4801a51da73e27c7cfca5cb
parenta9da892b57028aecf2286045926e71de4a193876
parent989d8a7c2927b83648f4e698c87c0ad7c4cea24d
Merge branch 'master' of https://github.com/m-labs/misoc

Conflicts:
misoclib/mem/litesata/doc/source/docs/frontend/index.rst
misoclib/mem/litesata/doc/source/docs/frontend/index.rst