David S. Miller 49997d7515 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: Documentation/powerpc/booting-without-of.txt drivers/atm/Makefile drivers/net/fs_enet/fs_enet-main.c drivers/pci/pci-acpi.c net/8021q/vlan.c net/iucv/iucv.c		2008-07-18 02:39:39 -07:00
..
auth_gss.h	net: remove CVS keywords	2008-06-11 21:00:38 -07:00
auth.h	NFSv4: Reintroduce machine creds	2008-04-19 16:54:56 -04:00
cache.h	svcrpc: move unused field from cache_deferred_req	2008-04-23 16:13:37 -04:00
clnt.h	SUNRPC: Support registering IPv6 interfaces with local rpcbind daemon	2008-07-15 18:08:55 -04:00
debug.h
gss_api.h	net: remove CVS keywords	2008-06-11 21:00:38 -07:00
gss_asn1.h
gss_err.h
gss_krb5.h	gss_krb5: consistently use unsigned for seqnum	2008-04-23 16:13:41 -04:00
gss_spkm3.h
Kbuild
metrics.h
msg_prot.h
rpc_pipe_fs.h
rpc_rdma.h
sched.h	rpc: minor cleanup of scheduler callback code	2008-07-09 12:09:14 -04:00
stats.h
svc_rdma.h	svcrdma: Change svc_rdma_send_error return type to void	2008-05-19 07:34:01 -05:00
svc_xprt.h	svc: Add svc_xprt_names service to replace svc_sock_names	2008-02-01 16:42:14 -05:00
svc.h	SUNRPC: remove svc_create_thread()	2008-04-23 16:13:42 -04:00
svcauth_gss.h	net: remove CVS keywords	2008-06-11 21:00:38 -07:00
svcauth.h	IPv6 support for NFS server export caches	2008-04-23 16:13:36 -04:00
svcsock.h	SUNRPC: Update RPC server's TCP record marker decoder	2008-04-23 16:13:43 -04:00
timer.h
types.h
xdr.h
xprt.h	SUNRPC: Don't disconnect more than once if retransmitting NFSv4 requests	2008-04-19 16:55:12 -04:00
xprtrdma.h
xprtsock.h