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.c
auth_null.c
auth_unix.c
cache.c
clnt.c	[SUNRPC]: Use k{mem,str}dup where applicable	2006-12-02 21:30:20 -08:00
Makefile
pmap_clnt.c
rpc_pipe.c
sched.c
socklib.c	[NET]: Annotate callers of the reset of checksum.h stuff.	2006-12-02 21:23:34 -08:00
stats.c
sunrpc_syms.c
svc.c
svcauth.c
svcauth_unix.c
svcsock.c
sysctl.c
timer.c
xdr.c
xprt.c
xprtsock.c