David S. Miller b26d344c6b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/caif/caif_hsi.c drivers/net/usb/qmi_wwan.c The qmi_wwan merge was trivial. The caif_hsi.c, on the other hand, was not. It's a conflict between 1c385f1fdf ("caif-hsi: Replace platform device with ops structure.") in the net-next tree and commit 39abbaef19 ("caif-hsi: Postpone init of HIS until open()") in the net tree. I did my best with that one and will ask Sjur to check it out. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-28 17:37:00 -07:00
..
auth_gss	Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux	2012-06-01 08:32:58 -07:00
xprtrdma
addr.c
auth.c
auth_generic.c
auth_null.c
auth_unix.c
backchannel_rqst.c
bc_svc.c
cache.c
clnt.c	NFS client updates for Linux 3.5	2012-05-29 10:43:51 -07:00
Kconfig
Makefile
netns.h
rpc_pipe.c	rpc_pipefs: allow rpc_purge_list to take a NULL waitq pointer	2012-06-11 17:27:07 -04:00
rpcb_clnt.c	Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux	2012-06-01 08:32:58 -07:00
sched.c
socklib.c
stats.c
sunrpc.h
sunrpc_syms.c
svc.c	NFS client bugfixes for Linux 3.5	2012-06-15 17:37:23 -07:00
svc_xprt.c	Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux	2012-06-01 08:32:58 -07:00
svcauth.c
svcauth_unix.c	Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux	2012-06-01 08:32:58 -07:00
svcsock.c	net: skb_free_datagram_locked() doesnt drop all packets	2012-06-27 15:40:57 -07:00
sysctl.c
timer.c
xdr.c
xprt.c	NFS client updates for Linux 3.5	2012-05-29 10:43:51 -07:00
xprtsock.c