Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Mon, 31 Oct 2016 13:53:57 +0000 (13:53 +0000)
committerAlan Cox <alan@linux.intel.com>
Mon, 31 Oct 2016 13:53:57 +0000 (13:53 +0000)

Trivial merge