Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Thu, 4 Jan 2018 22:17:55 +0000 (22:17 +0000)
committerAlan Cox <alan@linux.intel.com>
Thu, 4 Jan 2018 22:17:55 +0000 (22:17 +0000)

Trivial merge