Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Wed, 15 Nov 2017 21:10:03 +0000 (21:10 +0000)
committerAlan Cox <alan@linux.intel.com>
Wed, 15 Nov 2017 21:10:03 +0000 (21:10 +0000)

Trivial merge