Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Fri, 15 May 2015 00:15:18 +0000 (01:15 +0100)
committerAlan Cox <alan@linux.intel.com>
Fri, 15 May 2015 00:15:18 +0000 (01:15 +0100)

Trivial merge