android_kernel_xiaomi_sm8350/include/linux/sunrpc
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
auth.h
cache.h
clnt.h
debug.h
gss_api.h
gss_asn1.h
gss_err.h
gss_krb5.h
gss_spkm3.h
Kbuild
metrics.h
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
stats.h
svc.h [PATCH] fix svc_procfunc declaration 2006-10-20 10:26:40 -07:00
svcauth_gss.h
svcauth.h
svcsock.h
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