Merge tag 'locks-v3.16' of git://git.samba.org/jlayton/linux into next

[pandora-kernel.git] / drivers / staging / lustre / lustre / llite / file.c

diff --cc drivers/staging/lustre/lustre/llite/file.c
Simple merge