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

Trivial merge