Merge tag 'locks-v3.15-4' of git://git.samba.org/jlayton/linux
[pandora-kernel.git] / arch / .gitignore
1 i386
2 x86_64