Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Sat, 30 May 2015 13:02:28 +0000 (14:02 +0100)
committerAlan Cox <alan@linux.intel.com>
Sat, 30 May 2015 13:02:28 +0000 (14:02 +0100)

Trivial merge