Merge branch 'devel' into linux-next
authorTrond Myklebust <trond.myklebust@primarydata.com>
Mon, 17 Mar 2014 19:15:21 +0000 (15:15 -0400)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Mon, 17 Mar 2014 19:15:21 +0000 (15:15 -0400)
1  2 
fs/nfs/internal.h
fs/nfs/nfs4proc.c
fs/nfs/nfs4state.c
include/linux/nfs_xdr.h

Simple merge
Simple merge
Simple merge
Simple merge