Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Fri, 16 Sep 2016 11:53:52 +0000 (12:53 +0100)
committerAlan Cox <alan@linux.intel.com>
Fri, 16 Sep 2016 11:53:52 +0000 (12:53 +0100)

Trivial merge