James Morris ece13879e7 Merge branch 'master' into next ...

Conflicts:
	security/Kconfig

Manual fix.

Signed-off-by: James Morris <jmorris@namei.org>

2009-08-20 09:18:42 +10:00

..

datagram.c

net: adding memory barrier to the poll and receive callbacks

2009-07-09 17:06:57 -07:00

dev_mcast.c

…

dev.c

Networking: use CAP_NET_ADMIN when deciding to call request_module

2009-08-14 11:18:34 +10:00

drop_monitor.c

…

dst.c

…

ethtool.c

…

fib_rules.c

…

filter.c

…

flow.c

…

gen_estimator.c

net: restore gnet_stats_basic to previous definition

2009-08-17 21:33:49 -07:00

gen_stats.c

net: restore gnet_stats_basic to previous definition

2009-08-17 21:33:49 -07:00

iovec.c

…

kmap_skb.h

…

link_watch.c

…

Makefile

…

neighbour.c

…

net_namespace.c

net: net_assign_generic() fix

2009-08-02 12:20:36 -07:00

net-sysfs.c

…

net-sysfs.h

…

net-traces.c

…

netevent.c

…

netpoll.c

netpoll: Fix carrier detection for drivers that are using phylib

2009-07-08 20:09:44 -07:00

pktgen.c

…

request_sock.c

…

rtnetlink.c

…

scm.c

…

skb_dma_map.c

…

skbuff.c

…

sock.c

Fix error return for setsockopt(SO_TIMESTAMPING)

2009-07-20 08:23:36 -07:00

stream.c

…

sysctl_net_core.c

…

user_dma.c

…

utils.c

…