Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / include / linux / nfs_fs_i.h
2006-03-20 Christoph Hellwiglockd: stop abusing file_lock_list
2005-06-22 Trond Myklebust[PATCH] NFSv4: Clean up nfs4 lock state accounting
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2