David S. Miller 43b03f1f6d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: MAINTAINERS drivers/net/wireless/iwlwifi/pcie/trans.c The iwlwifi conflict was resolved by keeping the code added in 'net' that turns off the buggy chip feature. The MAINTAINERS conflict was merely overlapping changes, one change updated all the wireless web site URLs and the other changed some GIT trees to be Johannes's instead of John's. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-12 21:59:18 -07:00
..
datagram.c	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
dev_addr_lists.c	net: addr_list: add exclusive dev_uc_add and dev_mc_add	2012-04-15 13:06:04 -04:00
dev.c	net-next: add dev_loopback_xmit() to avoid duplicate code	2012-06-12 18:51:09 -07:00
drop_monitor.c	drop_monitor: dont sleep in atomic context	2012-06-04 11:42:01 -04: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	ethtool: Make more commands available to unprivileged processes	2012-06-12 18:51:09 -07:00
fib_rules.c	fib_rules: Stop using NLA_PUT*().	2012-04-02 04:33:44 -04:00
filter.c	net/core: fix kernel-doc warnings	2012-06-08 22:20:58 -07: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	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	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	net: neighbour: fix neigh_dump_info()	2012-06-07 13:02:21 -07:00
net_namespace.c	net: core: Use pr_<level>	2012-05-17 05:00:04 -04:00
net-sysfs.c	wireless: remove wext sysfs	2012-06-05 15:32:15 -04: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	Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup	2012-05-22 17:40:19 -07:00
pktgen.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-20 21:53:04 -04:00
request_sock.c	ipv4:correct description for tcp_max_syn_backlog	2011-12-06 13:02:28 -05:00
rtnetlink.c	net: Convert net_ratelimit uses to net_<level>_ratelimited	2012-05-15 13:45:03 -04:00
scm.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
secure_seq.c	net: fix some sparse errors	2012-01-17 10:31:12 -05:00
skbuff.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-12 21:59:18 -07:00
sock_diag.c	sock_diag: add SK_MEMINFO_BACKLOG	2012-06-04 11:27:40 -04:00
sock.c	net: sock: validate data_len before allocating skb in sock_alloc_send_pskb()	2012-05-31 18:22:45 -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: Delete all remaining instances of ctl_path	2012-04-20 21:22:30 -04: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: Fixed coding style issues relating to braces.	2012-04-12 16:35:48 -04:00