David S. Miller ff4783ce78 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/sfc/rx.c Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change the rx_buf->is_page boolean into a set of u16 flags, and another to adjust how ->ip_summed is initialized. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-02-26 21:55:51 -05:00
..
datagram.c	datagram: Add offset argument to __skb_recv_datagram	2012-02-21 14:58:57 -05:00
dev_addr_lists.c	net: introduce netif_addr_lock_nested() and call if when appropriate	2012-01-09 12:46:58 -08:00
dev.c	gro: more generic L2 header check	2012-02-08 18:26:54 -05:00
drop_monitor.c	net,rcu: convert call_rcu(free_dm_hw_stat) to kfree_rcu()	2011-05-07 22:50:59 -07:00
dst.c	net: Rename dst_get_neighbour{, _raw} to dst_get_neighbour_noref{, _raw}.	2011-12-05 15:20:19 -05:00
ethtool.c	net: Support RX-ALL feature flag.	2012-02-24 01:42:07 -08:00
fib_rules.c	net: Fix files explicitly needing to include module.h	2011-10-31 19:30:28 -04:00
filter.c	filter: use unsigned int to silence static checker warning	2011-10-19 19:35:51 -04:00
flow_dissector.c	net: flow_dissector.c missing include linux/export.h	2012-01-24 16:03:33 -05:00
flow.c	net: Add a flow_cache_flush_deferred function	2011-12-21 16:48:08 -05:00
gen_estimator.c	net,rcu: convert call_rcu(__gen_kill_estimator) to kfree_rcu()	2011-05-07 22:50:57 -07:00
gen_stats.c	net/core: EXPORT_SYMBOL cleanups	2010-07-12 12:57:55 -07:00
iovec.c	net: Limit socket I/O iovec total length to INT_MAX.	2010-10-28 11:47:52 -07:00
kmap_skb.h	net: convert core to skb paged frag APIs	2011-08-24 17:52:11 -07:00
link_watch.c	net: linkwatch: allow vlans to get carrier changes faster	2011-09-15 15:36:34 -04:00
Makefile	sock_diag: Move the sock_ code to net/core/	2011-12-06 13:58:02 -05:00
neighbour.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-02-26 21:55:51 -05:00
net_namespace.c	netns: fix net_alloc_generic()	2012-01-26 13:36:19 -05:00
net-sysfs.c	bql: Fix inconsistency between file mode and attr method.	2012-01-17 10:05:55 -05:00
net-sysfs.h	xps: Add CONFIG_XPS	2010-11-28 18:24:14 -08:00
net-traces.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
netevent.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
netpoll.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-02-19 16:03:15 -05:00
netprio_cgroup.c	netprio_cgroup: don't allocate prio table when a device is registered	2012-02-10 15:08:57 -05:00
pktgen.c	pktgen: Fix unsigned function that is returning negative vals	2012-01-22 15:08:44 -05:00
request_sock.c	ipv4:correct description for tcp_max_syn_backlog	2011-12-06 13:02:28 -05:00
rtnetlink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-02-26 21:55:51 -05:00
scm.c	af_unix: dont send SCM_CREDENTIALS by default	2011-09-28 13:29:50 -04:00
secure_seq.c	net: fix some sparse errors	2012-01-17 10:31:12 -05:00
skbuff.c	net: Add framework to allow sending packets with customized CRC.	2012-02-24 01:37:35 -08:00
sock_diag.c	sock_diag: Introduce the meminfo nla core (v2)	2011-12-30 16:42:19 -05:00
sock.c	net: Add missing getsockopt for SO_NOFCS.	2012-02-24 14:48:34 -05:00
stream.c	net: Fix the condition passed to sk_wait_event()	2010-10-03 20:41:32 -07:00
sysctl_net_core.c	net: use jump_label to shortcut RPS if not setup	2011-11-17 17:06:08 -05:00
timestamping.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
user_dma.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
utils.c	net: Kill ratelimit.h dependency in linux/net.h	2011-05-27 13:41:33 -04:00