Merge commit '840f5b0572ea' into v4l_for_linus
[linux-2.6-block.git] / arch / um / .gitignore
1 kernel/config.c
2 kernel/config.tmp
3 kernel/vmlinux.lds