Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Wed, 31 Aug 2016 19:11:26 +0000 (20:11 +0100)
committerAlan Cox <alan@linux.intel.com>
Wed, 31 Aug 2016 19:11:26 +0000 (20:11 +0100)

Trivial merge