Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@linux.intel.com>
Wed, 21 Jan 2015 20:27:42 +0000 (20:27 +0000)
committerAlan Cox <alan@linux.intel.com>
Wed, 21 Jan 2015 20:27:42 +0000 (20:27 +0000)

Trivial merge