Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Tue, 13 Jan 2015 22:03:19 +0000 (22:03 +0000)
committerAlan Cox <alan@linux.intel.com>
Tue, 13 Jan 2015 22:03:19 +0000 (22:03 +0000)

Trivial merge