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

Trivial merge