David S. Miller 06c54055be Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c net/bridge/br_multicast.c net/ipv6/sit.c The conflicts were minor: 1) sit.c changes overlap with change to ip_tunnel_xmit() signature. 2) br_multicast.c had an overlap between computing max_delay using msecs_to_jiffies and turning MLDV2_MRC() into an inline function with a name using lowercase instead of uppercase letters. 3) stmmac had two overlapping changes, one which conditionally allocated and hooked up a dma_cfg based upon the presence of the pbl OF property, and another one handling store-and-forward DMA made. The latter of which should not go into the new of_find_property() basic block. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-09-05 14:58:52 -04:00
..
auth_gss	svcrpc: set cr_gss_mech from gss-proxy as well as legacy upcall	2013-08-01 08:42:01 -04:00
xprtrdma	Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux	2013-07-17 13:43:55 -07:00
Kconfig	Merge branch 'rpcsec_gss-from_cel' into linux-next	2013-04-23 15:40:40 -04:00
Makefile	SUNRPC: sunrpc should not explicitly depend on NFS config options	2011-07-15 09:12:23 -04:00
addr.c	sunrpc: move address copy/cmp/convert routines and prototypes from clnt.h to addr.h	2013-02-05 09:41:14 -05:00
auth.c	SUNRPC: Don't recognize RPC_AUTH_MAXFLAVOR	2013-04-04 17:01:00 -04:00
auth_generic.c	sunrpc: Convert kuids and kgids to uids and gids for printing	2013-02-13 06:15:19 -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	sunrpc: Properly encode kuids and kgids in RPC_AUTH_UNIX credentials	2013-02-13 06:15:24 -08:00
backchannel_rqst.c	SUNRPC: remove two BUG_ON asserts	2012-11-04 14:43:41 -05:00
bc_svc.c	SUNRPC: remove BUG_ON from bc_send	2012-11-04 14:43:41 -05:00
cache.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-07-14 11:42:26 -07:00
clnt.c	SUNRPC: If the rpcbind channel is disconnected, fail the call to unregister	2013-08-07 17:07:18 -04:00
netns.h	SUNRPC: If the rpcbind channel is disconnected, fail the call to unregister	2013-08-07 17:07:18 -04:00
rpc_pipe.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-07-14 11:42:26 -07:00
rpcb_clnt.c	SUNRPC: If the rpcbind channel is disconnected, fail the call to unregister	2013-08-07 17:07:18 -04:00
sched.c	NFS client updates for Linux 3.11	2013-07-09 12:09:43 -07:00
socklib.c	sunrpc: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:28 +08:00
stats.c	procfs: new helper - PDE_DATA(inode)	2013-04-09 14:13:32 -04: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	drivers: avoid parsing names as kthread_run() format strings	2013-07-03 16:07:41 -07:00
svc_xprt.c	svcrpc: fix rpc server shutdown races	2013-02-17 10:53:51 -05:00
svcauth.c	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
svcauth_unix.c	svcrpc: fix failures to handle -1 uid's	2013-07-08 17:27:23 -04:00
svcsock.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-08-03 21:36:46 -07:00
sysctl.c	net: Convert uses of typedef ctl_table to struct ctl_table	2013-06-13 02:36:09 -07:00
timer.c	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
xdr.c	SUNRPC: Fix memory corruption issue on 32-bit highmem systems	2013-08-28 15:43:43 -04:00
xprt.c	SUNRPC: allow disabling idle timeout	2013-04-26 11:41:26 -04:00
xprtsock.c	net: add sk_stream_is_writeable() helper	2013-07-24 17:54:48 -07:00