Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Thu, 19 Oct 2017 20:09:10 +0000 (21:09 +0100)
committerAlan Cox <alan@linux.intel.com>
Thu, 19 Oct 2017 20:09:10 +0000 (21:09 +0100)

Trivial merge