Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Tue, 18 Oct 2016 22:06:33 +0000 (23:06 +0100)
committerAlan Cox <alan@linux.intel.com>
Tue, 18 Oct 2016 22:06:33 +0000 (23:06 +0100)

Trivial merge