Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
[pandora-kernel.git] / arch / um / .gitignore
1 kernel/config.c
2 kernel/config.tmp
3 kernel/vmlinux.lds