Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Thu, 1 Feb 2018 00:43:56 +0000 (00:43 +0000)
committerAlan Cox <alan@linux.intel.com>
Thu, 1 Feb 2018 00:43:56 +0000 (00:43 +0000)

Trivial merge