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

Trivial merge