Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Sat, 24 Jan 2015 23:34:26 +0000 (23:34 +0000)
committerAlan Cox <alan@linux.intel.com>
Sat, 24 Jan 2015 23:34:26 +0000 (23:34 +0000)

Trivial merge