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	Merge branch 'for-3.4' of git://linux-nfs.org/~bfields/linux	2012-03-29 14:53:25 -07:00
addr.c	SUNRPC: parametrize rpc_uaddr2sockaddr() by network context	2012-01-31 19:28:12 -05:00
auth_generic.c	userns: Convert group_info values from gid_t to kgid_t.	2012-05-03 03:27:21 -07:00
auth_null.c	SUNRPC: Move the bound cred to struct rpc_rqst	2010-08-04 08:54:09 -04:00
auth_unix.c	userns: Convert group_info values from gid_t to kgid_t.	2012-05-03 03:27:21 -07:00
auth.c	net: Remove unnecessary semicolons	2011-06-05 14:33:39 -07:00
backchannel_rqst.c	SUNRPC: Fix a few sparse warnings	2012-03-11 19:30:02 -04:00
bc_svc.c	SUNRPC: sunrpc should not explicitly depend on NFS config options	2011-07-15 09:12:23 -04:00
cache.c	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
clnt.c	NFS client updates for Linux 3.5	2012-05-29 10:43:51 -07:00
Kconfig	SUNRPC/NFS: Add Kbuild dependencies for NFS_DEBUG/RPC_DEBUG	2012-03-20 13:08:26 -04:00
Makefile	SUNRPC: sunrpc should not explicitly depend on NFS config options	2011-07-15 09:12:23 -04:00
netns.h	SUNRPC: create GSS auth cache per network namespace	2012-01-31 19:28:15 -05:00
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	SUNRPC: We must not use list_for_each_entry_safe() in rpc_wake_up()	2012-03-19 14:15:02 -04:00
socklib.c	sunrpc: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:28 +08:00
stats.c	SUNRPC: Use RCU to dereference the rpc_clnt.cl_xprt field	2012-03-02 15:36:38 -05:00
sunrpc_syms.c	SUNRPC: register PipeFS file system after pernet sybsystem	2012-04-18 11:05:48 -04:00
sunrpc.h	SUNRPC: subscribe RPC clients to pipefs notifications	2012-01-31 18:20:25 -05:00
svc_xprt.c	Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux	2012-06-01 08:32:58 -07:00
svc.c	NFS client bugfixes for Linux 3.5	2012-06-15 17:37:23 -07:00
svcauth_unix.c	Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux	2012-06-01 08:32:58 -07:00
svcauth.c	net: sunrpc: kill unused macros	2010-12-17 15:48:21 -05:00
svcsock.c	net: skb_free_datagram_locked() doesnt drop all packets	2012-06-27 15:40:57 -07:00
sysctl.c	SUNRPC: make SUNPRC clients list per network namespace context	2012-01-31 18:20:25 -05:00
timer.c	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
xdr.c	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
xprt.c	NFS client updates for Linux 3.5	2012-05-29 10:43:51 -07:00
xprtsock.c	sunrpc: skip portmap calls on sessions backchannel	2012-03-26 11:49:48 -04:00