Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Sat, 31 Jan 2015 00:08:15 +0000 (00:08 +0000)
committerAlan Cox <alan@linux.intel.com>
Sat, 31 Jan 2015 00:08:15 +0000 (00:08 +0000)

Trivial merge