Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Sun, 8 Mar 2015 18:01:54 +0000 (18:01 +0000)
committerAlan Cox <alan@linux.intel.com>
Sun, 8 Mar 2015 18:01:54 +0000 (18:01 +0000)

Trivial merge