Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Tue, 23 Feb 2016 20:49:27 +0000 (20:49 +0000)
committerAlan Cox <alan@linux.intel.com>
Tue, 23 Feb 2016 20:49:27 +0000 (20:49 +0000)

Trivial merge