David S. Miller a210576cf8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/mac80211/sta_info.c net/wireless/core.h Two minor conflicts in wireless. Overlapping additions of extern declarations in net/wireless/core.h and a bug fix overlapping with the addition of a boolean parameter to __ieee80211_key_free(). Signed-off-by: David S. Miller <davem@davemloft.net>		2013-04-01 13:36:50 -04:00
..
datagram.c	net: add option to enable error queue packets waking select	2013-03-31 19:44:20 -04:00
dev_addr_lists.c	net: move procfs code to net/core/net-procfs.c	2013-02-19 00:51:10 -05:00
dev_ioctl.c	net: move ioctl functions into a separated file	2013-02-18 12:27:32 -05:00
dev.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-01 13:36:50 -04:00
drop_monitor.c	drop_monitor: dont sleep in atomic context	2012-06-04 11:42:01 -04:00
dst.c	ipv6: fix race condition regarding dst->expires and dst->from.	2013-02-20 15:11:45 -05:00
ethtool.c	tunneling: Add generic Tunnel segmentation.	2013-03-09 16:09:17 -05:00
fib_rules.c	rtnetlink: Remove passing of attributes into rtnl_doit functions	2013-03-22 10:31:16 -04:00
filter.c	filter: add ANC_PAY_OFFSET instruction for loading payload start offset	2013-03-20 13:15:45 -04:00
flow_dissector.c	net: flow_dissector: add __skb_get_poff to get a start offset to payload	2013-03-20 13:15:45 -04:00
flow.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-01 13:36:50 -04:00
gen_estimator.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
gen_stats.c	gen_stats: Stop using NLA_PUT*().	2012-04-02 04:33:44 -04:00
iovec.c	net: get rid of some pointless casts to sockaddr	2012-03-11 19:11:22 -07:00
link_watch.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-10-02 13:38:27 -07:00
Makefile	net: move procfs code to net/core/net-procfs.c	2013-02-19 00:51:10 -05:00
neighbour.c	rtnetlink: Remove passing of attributes into rtnl_doit functions	2013-03-22 10:31:16 -04:00
net_namespace.c	new helper: file_inode(file)	2013-02-22 23:31:31 -05:00
net-procfs.c	net: Print functions in /proc/net/ptype without the offset.	2013-03-25 14:12:55 -04:00
net-sysfs.c	net/core: apply pm_runtime_set_memalloc_noio on network devices	2013-02-23 17:50:16 -08: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	netpoll: use DEFINE_STATIC_SRCU() to define netpoll_srcu	2013-03-17 12:42:43 -04:00
netprio_cgroup.c	net: core: Remove unnecessary alloc/OOM messages	2013-02-06 14:58:52 -05:00
pktgen.c	net: proc: change proc_net_remove to remove_proc_entry	2013-02-18 14:53:08 -05:00
request_sock.c	tcp: fix a panic on UP machines in reqsk_fastopen_remove	2013-01-14 18:10:05 -05:00
rtnetlink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-01 13:36:50 -04:00
scm.c	scm: Require CAP_SYS_ADMIN over the current pidns to spoof pids.	2013-03-17 17:16:16 -07:00
secure_seq.c	netfilter: ipv6: add IPv6 NAT support	2012-08-30 03:00:17 +02:00
skbuff.c	net: core: let skb_partial_csum_set() set transport header	2013-03-27 12:48:31 -04:00
sock_diag.c	sock_diag: Simplify sock_diag_handlers[] handling in __sock_diag_rcv_msg	2013-02-23 13:51:54 -05:00
sock.c	net: add option to enable error queue packets waking select	2013-03-31 19:44:20 -04: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: avoid to hang up on sending due to sysctl configuration overflow.	2013-01-28 23:15:27 -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: core: let's use native isxdigit instead of custom	2013-03-27 12:48:32 -04:00