Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Mon, 2 Feb 2015 13:00:32 +0000 (13:00 +0000)
committerAlan Cox <alan@linux.intel.com>
Mon, 2 Feb 2015 13:00:32 +0000 (13:00 +0000)

Trivial merge