David S. Miller 4a35ecf8bf Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/bonding/bond_main.c
	drivers/net/via-velocity.c
	drivers/net/wireless/iwlwifi/iwl-agn.c

2010-04-06 23:53:30 -07:00

..

auth_gss

net: remove trailing space in messages

2010-03-24 14:01:54 -07:00

xprtrdma

net/sunrpc: Convert (void)snprintf to snprintf

2010-03-08 12:15:59 -08:00

addr.c

SUNRPC: Don't display zero scope IDs

2010-02-10 08:30:53 -05:00

auth_generic.c

…

auth_null.c

…

auth_unix.c

…

auth.c

Merge branch 'nfs-for-2.6.33'

2009-12-13 13:56:27 -05:00

backchannel_rqst.c

…

bc_svc.c

net: remove trailing space in messages

2010-03-24 14:01:54 -07:00

cache.c

…

clnt.c

SUNRPC: soft connect semantics for UDP

2009-12-03 15:58:56 -05:00

Kconfig

…

Makefile

…

rpc_pipe.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

2010-03-04 08:15:33 -08:00

rpcb_clnt.c

SUNRPC: Use soft connects for autobinding over TCP

2009-12-03 15:58:56 -05:00

sched.c

nfs: enforce FIFO ordering of operations trying to acquire slot

2009-12-15 13:55:18 -05:00

socklib.c

…

stats.c

…

sunrpc_syms.c

SUNRPC: Use a cached RPC client and transport for rpcbind upcalls

2009-12-03 15:58:56 -05:00

sunrpc.h

…

svc_xprt.c

Revert "sunrpc: move the close processing after do recvfrom method"

2010-02-28 16:39:30 -05:00

svc.c

nodemask.h: remove macro any_online_node

2010-03-06 11:26:31 -08:00

svcauth_unix.c

svcrpc: treat uid's as unsigned

2010-03-02 15:49:21 -05:00

svcauth.c

…

svcsock.c

nfsd: ensure sockets are closed on error

2010-02-28 23:21:51 -05:00

sysctl.c

…

timer.c

…

xdr.c

…

xprt.c

…

xprtsock.c

Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

2010-03-18 16:50:09 -07:00