Merge branch 'linus' into sched/core
[pandora-kernel.git] / arch / um / .gitignore
1 kernel/config.c
2 kernel/config.tmp
3 kernel/vmlinux.lds