Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Sun, 4 Feb 2018 20:36:41 +0000 (20:36 +0000)
committerAlan Cox <alan@linux.intel.com>
Sun, 4 Feb 2018 20:36:41 +0000 (20:36 +0000)

Trivial merge