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)
commitbd0f725c4c0bd77b6d931f63eda2d51423a22d43
tree95caf3ce41ef7d73eae1972ad04b230cdeed6340
parent2ca310fc4160ed0420da65534a21ae77b24326a8
parentfdb63dcdb53a3c6dc11d4e438ef2425ec962d1e9
Merge branch 'devel' into linux-next
fs/nfs/internal.h
fs/nfs/nfs4proc.c
fs/nfs/nfs4state.c
include/linux/nfs_xdr.h