Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2
[linux-2.6] / arch / i386 / boot / .gitignore
1 bootsect
2 bzImage
3 setup