Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Thu, 1 Oct 2015 18:26:02 +0000 (19:26 +0100)
committerAlan Cox <alan@linux.intel.com>
Thu, 1 Oct 2015 18:26:02 +0000 (19:26 +0100)

Trivial merge