leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4c1ac1b491
linux/net/sunrpc
History
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 14:37:56 +00:00
..
auth_gss [SUNRPC]: Use k{mem,str}dup where applicable 2006-12-02 21:30:20 -08:00
auth_null.c [SUNRPC]: trivial endianness annotations 2006-09-28 18:01:21 -07:00
auth_unix.c [SUNRPC]: trivial endianness annotations 2006-09-28 18:01:21 -07:00
auth.c [SUNRPC]: trivial endianness annotations 2006-09-28 18:01:21 -07:00
cache.c WorkStruct: Pass the work_struct pointer instead of context data 2006-11-22 14:55:48 +00:00
clnt.c [SUNRPC]: Use k{mem,str}dup where applicable 2006-12-02 21:30:20 -08:00
Makefile
pmap_clnt.c [PATCH] SUNRPC: fix race in in-kernel RPC portmapper client 2006-10-20 10:26:39 -07:00
rpc_pipe.c WorkStruct: Pass the work_struct pointer instead of context data 2006-11-22 14:55:48 +00:00
sched.c WorkStruct: Pass the work_struct pointer instead of context data 2006-11-22 14:55:48 +00:00
socklib.c [NET]: Annotate callers of the reset of checksum.h stuff. 2006-12-02 21:23:34 -08:00
stats.c [NET]: Conversions from kmalloc+memset to k(z|c)alloc. 2006-07-21 14:51:30 -07:00
sunrpc_syms.c [PATCH] knfsd: add svc_set_num_threads 2006-10-02 07:57:19 -07:00
svc.c [PATCH] knfsd: Allow lockd to drop replies as appropriate 2006-10-17 08:18:46 -07:00
svcauth_unix.c [SUNRPC]: annotate hash_ip() 2006-12-02 21:21:16 -08:00
svcauth.c [PATCH] sunrpc: add missing spin_unlock 2006-11-06 01:46:23 -08:00
svcsock.c [PATCH] fix "sunrpc: fix refcounting problems in rpc servers" 2006-10-30 12:12:21 -08:00
sysctl.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
timer.c SUNRPC: remove extraneous header inclusions 2006-09-22 23:24:47 -04:00
xdr.c [SUNRPC]: trivial endianness annotations 2006-09-28 18:01:21 -07:00
xprt.c WorkStruct: Pass the work_struct pointer instead of context data 2006-11-22 14:55:48 +00:00
xprtsock.c WorkStruct: Pass the work_struct pointer instead of context data 2006-11-22 14:55:48 +00:00