Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Sat, 19 Mar 2016 11:19:08 +0000 (11:19 +0000)
committerAlan Cox <alan@linux.intel.com>
Sat, 19 Mar 2016 11:19:08 +0000 (11:19 +0000)

Trivial merge