Merge branch 'master' into for-linus
[sfrench/cifs-2.6.git] / arch / um / .gitignore
1 kernel/config.c
2 kernel/config.tmp
3 kernel/vmlinux.lds