diff options
author | 2009-08-19 18:21:52 -0400 | |
---|---|---|
committer | 2009-08-19 18:21:52 -0400 | |
commit | 6a396f67d2442e30150ffb5e1142dbb2f2181d3f (patch) | |
tree | 2ea4f3ab1d3766204a55ec26600b848ed3a7e8aa /fs/nfs/dns_resolve.c | |
parent | Merge branch 'sunrpc_cache-for-2.6.32' into nfs-for-2.6.32 (diff) | |
parent | nfs: nfs4xdr: optimize low level decoding (diff) | |
download | wireguard-linux-6a396f67d2442e30150ffb5e1142dbb2f2181d3f.tar.xz wireguard-linux-6a396f67d2442e30150ffb5e1142dbb2f2181d3f.zip |
Merge branch 'nfsv4_xdr_cleanups-for-2.6.32' into nfs-for-2.6.32
Conflicts:
fs/nfs/nfs4xdr.c
Diffstat (limited to 'fs/nfs/dns_resolve.c')
0 files changed, 0 insertions, 0 deletions