Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Wed, 21 Oct 2015 09:14:08 +0000 (10:14 +0100)
committerAlan Cox <alan@linux.intel.com>
Wed, 21 Oct 2015 09:14:08 +0000 (10:14 +0100)

Trivial merge