Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Tue, 30 Dec 2014 12:05:33 +0000 (12:05 +0000)
committerAlan Cox <alan@linux.intel.com>
Tue, 30 Dec 2014 12:05:33 +0000 (12:05 +0000)
Merge together utils work and upstream github merges


Trivial merge