Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Sun, 29 Oct 2017 16:37:08 +0000 (16:37 +0000)
committerAlan Cox <alan@linux.intel.com>
Sun, 29 Oct 2017 16:37:08 +0000 (16:37 +0000)

Trivial merge