David S. Miller 0d6c4a2e46 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/e1000e/param.c drivers/net/wireless/iwlwifi/iwl-agn-rx.c drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c drivers/net/wireless/iwlwifi/iwl-trans.h Resolved the iwlwifi conflict with mainline using 3-way diff posted by John Linville and Stephen Rothwell. In 'net' we added a bug fix to make iwlwifi report a more accurate skb->truesize but this conflicted with RX path changes that happened meanwhile in net-next. In e1000e a conflict arose in the validation code for settings of adapter->itr. 'net-next' had more sophisticated logic so that logic was used. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-05-07 23:35:40 -04:00
..
auth_gss	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
xprtrdma	Merge branch 'for-3.4' of git://linux-nfs.org/~bfields/linux	2012-03-29 14:53:25 -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
addr.c	SUNRPC: parametrize rpc_uaddr2sockaddr() by network context	2012-01-31 19:28:12 -05:00
auth.c	net: Remove unnecessary semicolons	2011-06-05 14:33:39 -07:00
auth_generic.c	SUNRPC: Fix machine creds in generic_create_cred and generic_match	2012-01-23 14:03:46 -08:00
auth_null.c	SUNRPC: Move the bound cred to struct rpc_rqst	2010-08-04 08:54:09 -04:00
auth_unix.c	NFS/sunrpc: don't use a credential with extra groups.	2011-10-25 11:20:58 +02: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	SUNRPC: RPC client must use the current utsname hostname string	2012-04-30 11:58:51 -04:00
netns.h	SUNRPC: create GSS auth cache per network namespace	2012-01-31 19:28:15 -05:00
rpc_pipe.c	SUNRPC: set per-net PipeFS superblock before notification	2012-04-27 14:10:00 -04:00
rpcb_clnt.c	SUNRPC: Use the already looked-up xprt in rpcb_getport_async()	2012-03-27 16:33:35 -04: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.h	SUNRPC: subscribe RPC clients to pipefs notifications	2012-01-31 18:20:25 -05:00
sunrpc_syms.c	SUNRPC: register PipeFS file system after pernet sybsystem	2012-04-18 11:05:48 -04:00
svc.c	Lockd: per-net up and down routines introduced	2012-02-15 00:19:47 -05:00
svc_xprt.c	SUNRPC: service destruction in network namespace context	2012-02-15 00:19:45 -05:00
svcauth.c	net: sunrpc: kill unused macros	2010-12-17 15:48:21 -05:00
svcauth_unix.c	Merge nfs containerization work from Trond's tree	2012-03-26 11:48:54 -04:00
svcsock.c	sock: Introduce named constants for sk_reuse	2012-04-21 15:52:25 -04: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	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
xprtsock.c	sunrpc: skip portmap calls on sessions backchannel	2012-03-26 11:49:48 -04:00