Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Sun, 29 Apr 2018 22:14:38 +0000 (23:14 +0100)
committerAlan Cox <alan@linux.intel.com>
Sun, 29 Apr 2018 22:14:38 +0000 (23:14 +0100)

Trivial merge