David S. Miller 278554bd65 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wireless/ath/ar9170/usb.c drivers/scsi/iscsi_tcp.c net/ipv4/ipmr.c		2010-05-12 00:05:35 -07:00
..
auth_gss	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
xprtrdma	Merge branch 'for-2.6.34' of git://linux-nfs.org/~bfields/linux	2010-04-12 18:34:56 -07:00
addr.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
auth_generic.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
auth_null.c	headers: utsname.h redux	2009-09-23 18:13:10 -07:00
auth_unix.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
auth.c	SUNRPC: Fix a bug in rpcauth_prune_expired	2010-04-22 15:35:55 -04:00
backchannel_rqst.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
bc_svc.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
cache.c	net: Move && and || to end of previous line	2009-11-29 16:55:45 -08:00
clnt.c	SUNRPC: Fix the return value of rpc_run_bc_task()	2010-03-22 05:34:12 -04:00
Kconfig	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-04-03 15:24:35 -07:00
Makefile	SUNRPC: Provide functions for managing universal addresses	2009-08-09 15:09:34 -04:00
rpc_pipe.c	sunrpc: handle allocation errors from __rpc_lookup_create()	2010-03-22 05:34:13 -04:00
rpcb_clnt.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
sched.c	nfs: enforce FIFO ordering of operations trying to acquire slot	2009-12-15 13:55:18 -05:00
socklib.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
stats.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
sunrpc_syms.c	SUNRPC: Use a cached RPC client and transport for rpcbind upcalls	2009-12-03 15:58:56 -05:00
sunrpc.h	nfsd41: sunrpc: Added rpc server-side backchannel handling	2009-09-11 15:04:16 -04:00
svc_xprt.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
svc.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
svcauth_unix.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
svcauth.c	net: Move && and || to end of previous line	2009-11-29 16:55:45 -08:00
svcsock.c	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
sysctl.c	sysctl: Drop & in front of every proc_handler.	2009-11-18 08:37:40 -08:00
timer.c	SUNRPC: Add documenting comments in net/sunrpc/timer.c	2009-08-09 15:09:47 -04:00
xdr.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
xprt.c	net: Fix various endianness glitches	2010-04-20 19:06:52 -07:00
xprtsock.c	SUNRPC: Fix a use after free bug with the NFSv4.1 backchannel	2010-03-22 05:32:44 -04:00