Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Mon, 13 Nov 2017 01:34:58 +0000 (01:34 +0000)
committerAlan Cox <alan@linux.intel.com>
Mon, 13 Nov 2017 01:34:58 +0000 (01:34 +0000)

Trivial merge