Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[linux-2.6] / fs / dlm / ast.h
2006-01-18  David Teigland[DLM] The core of the DLM for GFS2/CLVM