You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		18 years ago
..
Kbuild	[HEADERS] One line per header in Kbuild files to reduce conflicts	19 years ago
auth.h	[PATCH] knfsd: Prepare knfsd for support of rsize/wsize of up to 1MB, over TCP	19 years ago
auth_gss.h	fix file specification in comments	19 years ago
cache.h	[PATCH] knfsd: knfsd: cache ipmap per TCP socket	19 years ago
clnt.h	SUNRPC: Eliminate xprt_create_proto and rpc_create_client	19 years ago
debug.h	Don't include linux/config.h from anywhere else in include/	19 years ago
gss_api.h	fix file specification in comments	19 years ago
gss_asn1.h	Linux-2.6.12-rc2	20 years ago
gss_err.h	RPCSEC_GSS remove all qop parameters	20 years ago
gss_krb5.h	[SUNRPC] GSS: Use block ciphers where applicable	19 years ago
gss_spkm3.h	[SUNRPC] GSS: Use block ciphers where applicable	19 years ago
metrics.h	NFS: fix PROC_FS=n compile error	19 years ago
msg_prot.h	[PATCH] knfsd: Allow lockd to drop replies as appropriate	19 years ago
rpc_pipe_fs.h	WorkStruct: Separate delayable and non-delayable events.	18 years ago
sched.h	SUNRPC: Support for RPC child tasks no longer needed	19 years ago
stats.h	Don't include linux/config.h from anywhere else in include/	19 years ago
svc.h	[PATCH] fix svc_procfunc declaration	19 years ago
svcauth.h	[PATCH] knfsd: knfsd: cache ipmap per TCP socket	19 years ago
svcauth_gss.h	fix file specification in comments	19 years ago
svcsock.h	[PATCH] knfsd: knfsd: cache ipmap per TCP socket	19 years ago
timer.h	Linux-2.6.12-rc2	20 years ago
types.h	Linux-2.6.12-rc2	20 years ago
xdr.h	[NET]: Annotate csum_partial() callers in net/*	18 years ago
xprt.h	WorkStruct: Separate delayable and non-delayable events.	18 years ago