Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Mon, 11 Dec 2017 15:45:44 +0000 (15:45 +0000)
committerAlan Cox <alan@linux.intel.com>
Mon, 11 Dec 2017 15:45:44 +0000 (15:45 +0000)

Trivial merge