Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Sun, 15 Oct 2017 18:02:20 +0000 (19:02 +0100)
committerAlan Cox <alan@linux.intel.com>
Sun, 15 Oct 2017 18:02:20 +0000 (19:02 +0100)

Trivial merge