* .gitignore:
Merge branch 'master' of https://github.com/aryx/fork-xv6