Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Fri, 26 Aug 2016 15:04:36 +0000 (16:04 +0100)
committerAlan Cox <alan@linux.intel.com>
Fri, 26 Aug 2016 15:04:36 +0000 (16:04 +0100)

Trivial merge