Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Thu, 21 Dec 2017 14:12:50 +0000 (14:12 +0000)
committerAlan Cox <alan@linux.intel.com>
Thu, 21 Dec 2017 14:12:50 +0000 (14:12 +0000)

Trivial merge