Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
[safe/jmp/linux-2.6] / include / linux / dlm_netlink.h
2007-07-09 David Teigland[DLM] add lock timeouts and warnings [2/6]