Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[pandora-kernel.git] / fs / locks.c
diff --cc fs/locks.c
Simple merge