David S. Miller d5ef8a4d87 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/infiniband/hw/nes/nes_cm.c

Simple whitespace conflict.

Signed-off-by: David S. Miller <davem@davemloft.net>

2012-02-10 23:32:28 -05:00

..

datagram.c

…

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

…

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: Null-terminate filename passed to ethtool_ops::flash_device

2012-02-01 14:47:17 -05: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

…

gen_stats.c

…

iovec.c

…

kmap_skb.h

…

link_watch.c

…

Makefile

sock_diag: Move the sock_ code to net/core/

2011-12-06 13:58:02 -05:00

neighbour.c

net: Allow ipv6 proxies and arp proxies be shown with iproute2

2012-01-30 12:57:34 -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

…

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: Neaten MAX_SKB_SIZE macro

2012-02-01 14:20:27 -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

net: RTNETLINK adjusting values of min_ifinfo_dump_size

2012-01-26 16:35:57 -05:00

scm.c

…

secure_seq.c

net: fix some sparse errors

2012-01-17 10:31:12 -05:00

skbuff.c

net:core: use IS_ENABLED

2011-12-16 15:49:51 -05:00

sock_diag.c

sock_diag: Introduce the meminfo nla core (v2)

2011-12-30 16:42:19 -05:00

sock.c

netprio_cgroup: fix wrong memory access when NETPRIO_CGROUP=m

2012-02-10 15:08:57 -05:00

stream.c

…

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

…