Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Thu, 21 Jan 2016 11:55:13 +0000 (11:55 +0000)
committerAlan Cox <alan@linux.intel.com>
Thu, 21 Jan 2016 11:55:13 +0000 (11:55 +0000)

Trivial merge