David S. Miller 9f6ec8d697 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
	drivers/net/wireless/rtlwifi/pci.c
	net/netfilter/ipvs/ip_vs_core.c

2011-06-20 22:29:08 -07:00

..

datagram.c

Fix a typo in datagram.c and sctp/socket.c.

2010-12-06 13:10:11 -08:00

dev_addr_lists.c

net,rcu: convert call_rcu(ha_rcu_free) to kfree_rcu()

2011-05-07 22:50:52 -07:00

dev.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-06-20 22:29:08 -07: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: fix __dst_destroy_metrics_generic()

2011-05-24 13:29:50 -04:00

ethtool.c

v2 ethtool: remove support for ETHTOOL_GRXNTUPLE

2011-06-08 16:45:31 -07:00

fib_rules.c

rtnetlink: Compute and store minimum ifinfo dump size

2011-06-09 20:38:07 -07:00

filter.c

bug.h: Move ratelimit warn interfaces to ratelimit.h

2011-05-26 15:00:31 -04:00

flow.c

net: Make flow cache paths use a const struct flowi.

2011-02-22 18:44:31 -08: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

[PATCH] severing skbuff.h -> highmem.h

2006-12-04 02:00:29 -05:00

link_watch.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

Makefile

net: support time stamping in phy devices.

2010-07-18 19:15:26 -07:00

neighbour.c

rtnetlink: Compute and store minimum ifinfo dump size

2011-06-09 20:38:07 -07:00

net_namespace.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

2011-06-16 10:21:59 -07:00

net-sysfs.c

Delay struct net freeing while there's a sysfs instance refering to it

2011-06-12 17:45:41 -04:00

net-sysfs.h

xps: Add CONFIG_XPS

2010-11-28 18:24:14 -08:00

net-traces.c

netdev: Add tracepoints to netdev layer

2010-09-07 17:51:33 +02:00

netevent.c

net/core: EXPORT_SYMBOL cleanups

2010-07-12 12:57:55 -07:00

netpoll.c

netpoll: call dev_put() on error in netpoll_setup()

2011-06-11 18:55:22 -07:00

pktgen.c

pktgen: refactor pg_init() code

2011-05-22 21:01:22 -04:00

request_sock.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-12-08 13:47:38 -08:00

rtnetlink.c

rtnetlink: Compute and store minimum ifinfo dump size

2011-06-09 20:38:07 -07:00

scm.c

Allow passing O_PATH descriptors via SCM_RIGHTS datagrams

2011-03-15 02:21:45 -04:00

skbuff.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2011-05-20 13:43:21 -07:00

sock.c

Fix common misspellings

2011-03-31 11:26:23 -03: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: Kill ratelimit.h dependency in linux/net.h

2011-05-27 13:41:33 -04:00

timestamping.c

net: export the receive time stamping hook for non-NAPI drivers

2011-06-20 13:56:53 -07:00

user_dma.c

net/core/user_dma.c: Use frag list abstraction interfaces.

2009-06-09 00:19:10 -07:00

utils.c

net: Kill ratelimit.h dependency in linux/net.h

2011-05-27 13:41:33 -04:00