Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Tue, 10 Apr 2018 21:51:02 +0000 (22:51 +0100)
committerAlan Cox <alan@linux.intel.com>
Tue, 10 Apr 2018 21:51:02 +0000 (22:51 +0100)

Trivial merge