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

Trivial merge