Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Sat, 9 May 2015 17:34:50 +0000 (18:34 +0100)
committerAlan Cox <alan@linux.intel.com>
Sat, 9 May 2015 17:34:50 +0000 (18:34 +0100)

Trivial merge