Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Sun, 28 Jan 2018 15:22:03 +0000 (15:22 +0000)
committerAlan Cox <alan@linux.intel.com>
Sun, 28 Jan 2018 15:22:03 +0000 (15:22 +0000)

Trivial merge