Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Mon, 20 Jun 2016 19:03:59 +0000 (20:03 +0100)
committerAlan Cox <alan@linux.intel.com>
Mon, 20 Jun 2016 19:03:59 +0000 (20:03 +0100)

Trivial merge