Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Mon, 19 Oct 2015 10:52:08 +0000 (11:52 +0100)
committerAlan Cox <alan@linux.intel.com>
Mon, 19 Oct 2015 10:52:08 +0000 (11:52 +0100)

Trivial merge