Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
[safe/jmp/linux-2.6] / fs / dlm / dir.h
2006-01-18 David Teigland[DLM] The core of the DLM for GFS2/CLVM