Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[safe/jmp/linux-2.6] / fs / ocfs2 / locks.h
2008-01-25 Mark Fasheh[PATCH 2/2] ocfs2: cluster aware flock()