Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Tue, 17 Mar 2015 12:21:15 +0000 (12:21 +0000)
committerAlan Cox <alan@linux.intel.com>
Tue, 17 Mar 2015 12:21:15 +0000 (12:21 +0000)

Trivial merge