Merge tag 'locks-v3.16-2' of git://git.samba.org/jlayton/linux
[cascardo/linux.git] / arch / um / .gitignore
1 kernel/config.c
2 kernel/config.tmp
3 kernel/vmlinux.lds