Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Sun, 3 Dec 2017 20:27:38 +0000 (20:27 +0000)
committerAlan Cox <alan@linux.intel.com>
Sun, 3 Dec 2017 20:27:38 +0000 (20:27 +0000)

Trivial merge