Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Fri, 17 Jun 2016 18:30:01 +0000 (19:30 +0100)
committerAlan Cox <alan@linux.intel.com>
Fri, 17 Jun 2016 18:30:01 +0000 (19:30 +0100)

Trivial merge