Merge branch 'master' of https://github.com/enjoy-digital/litex into upstream
authorPaul Schulz <paul@mawsonlakes.org>
Wed, 24 Jan 2018 03:02:42 +0000 (13:32 +1030)
committerPaul Schulz <paul@mawsonlakes.org>
Wed, 24 Jan 2018 03:02:42 +0000 (13:32 +1030)

Trivial merge