Merge branch 'devel' into next
Trond Myklebust [Tue, 30 Dec 2008 21:51:43 +0000 (16:51 -0500)]
1  2 
fs/lockd/host.c
fs/nfs/nfsroot.c
fs/nfs/super.c
fs/nfsd/nfs4state.c
net/sunrpc/auth.c
net/sunrpc/clnt.c

diff --cc fs/lockd/host.c
Simple merge
Simple merge
diff --cc fs/nfs/super.c
Simple merge
Simple merge
Simple merge
Simple merge