Merge Will's fixes
authorAlan Cox <alan@linux.intel.com>
Sat, 27 Dec 2014 00:42:05 +0000 (00:42 +0000)
committerAlan Cox <alan@linux.intel.com>
Sat, 27 Dec 2014 00:42:05 +0000 (00:42 +0000)
Merge branch 'master' of https://github.com/EtchedPixels/FUZIX


Trivial merge