Merge branch 'upstream-fixes' into upstream
[linux-2.6] / arch / i386 / boot / .gitignore
1 bootsect
2 bzImage
3 setup