Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Tue, 12 May 2015 23:04:44 +0000 (00:04 +0100)
committerAlan Cox <alan@linux.intel.com>
Tue, 12 May 2015 23:04:44 +0000 (00:04 +0100)

Trivial merge