Merge branch 'devel' into linux-next
Trond Myklebust [Fri, 4 Dec 2009 02:27:36 +0000 (21:27 -0500)]
1  2 
fs/nfs/nfs4proc.c
fs/nfs/nfs4state.c

Simple merge
Simple merge