renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 13:43:55 +08:00
Code
f7267c0c07
linux-next/include/linux/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.h fix file specification in comments 2006-10-03 23:01:26 +02:00
auth.h [PATCH] knfsd: Prepare knfsd for support of rsize/wsize of up to 1MB, over TCP 2006-10-04 07:55:16 -07:00
cache.h [PATCH] knfsd: knfsd: cache ipmap per TCP socket 2006-10-04 07:55:16 -07:00
clnt.h SUNRPC: Eliminate xprt_create_proto and rpc_create_client 2006-09-22 23:24:51 -04:00
debug.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
gss_api.h fix file specification in comments 2006-10-03 23:01:26 +02:00
gss_asn1.h
gss_err.h RPCSEC_GSS remove all qop parameters 2005-10-18 23:19:47 -07:00
gss_krb5.h [SUNRPC] GSS: Use block ciphers where applicable 2006-09-21 11:46:15 +10:00
gss_spkm3.h [SUNRPC] GSS: Use block ciphers where applicable 2006-09-21 11:46:15 +10:00
Kbuild [HEADERS] One line per header in Kbuild files to reduce conflicts 2006-09-19 12:43:58 +01:00
metrics.h NFS: fix PROC_FS=n compile error 2006-04-19 12:43:46 -04:00
msg_prot.h [PATCH] knfsd: Allow lockd to drop replies as appropriate 2006-10-17 08:18:46 -07:00
rpc_pipe_fs.h WorkStruct: Separate delayable and non-delayable events. 2006-11-22 14:54:01 +00:00
sched.h SUNRPC: Support for RPC child tasks no longer needed 2006-09-22 23:24:40 -04:00
stats.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
svc.h [PATCH] fix svc_procfunc declaration 2006-10-20 10:26:40 -07:00
svcauth_gss.h fix file specification in comments 2006-10-03 23:01:26 +02:00
svcauth.h [PATCH] knfsd: knfsd: cache ipmap per TCP socket 2006-10-04 07:55:16 -07:00
svcsock.h [PATCH] knfsd: knfsd: cache ipmap per TCP socket 2006-10-04 07:55:16 -07:00
timer.h
types.h
xdr.h [NET]: Annotate csum_partial() callers in net/* 2006-12-02 21:23:32 -08:00
xprt.h WorkStruct: Separate delayable and non-delayable events. 2006-11-22 14:54:01 +00:00