Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Sun, 15 Feb 2015 13:44:55 +0000 (13:44 +0000)
committerAlan Cox <alan@linux.intel.com>
Sun, 15 Feb 2015 13:44:55 +0000 (13:44 +0000)

Trivial merge