Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Mon, 7 Nov 2016 20:34:04 +0000 (20:34 +0000)
committerAlan Cox <alan@linux.intel.com>
Mon, 7 Nov 2016 20:34:04 +0000 (20:34 +0000)

Trivial merge