Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Sun, 28 Aug 2016 22:51:12 +0000 (23:51 +0100)
committerAlan Cox <alan@linux.intel.com>
Sun, 28 Aug 2016 22:51:12 +0000 (23:51 +0100)

Trivial merge