Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Trond Myklebust [Wed, 21 Jun 2006 00:46:21 +0000 (20:46 -0400)]
Conflicts:

include/linux/nfs_fs.h

Fixed up conflict with kernel header updates.

1  2 
include/linux/fs.h
include/linux/lockd/lockd.h
include/linux/nfs4.h

Simple merge
Simple merge
Simple merge