Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Thu, 12 Mar 2015 22:28:45 +0000 (22:28 +0000)
committerAlan Cox <alan@linux.intel.com>
Thu, 12 Mar 2015 22:28:45 +0000 (22:28 +0000)

Trivial merge