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

Conflicts:
	net/core/dev.c

2010-10-21 08:43:05 -07:00

..

datagram.c

net: poll() optimizations

2010-09-06 18:48:45 -07:00

dev_addr_lists.c

…

dev.c

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

2010-10-21 08:43:05 -07:00

drop_monitor.c

drop_monitor: use genl_register_family_with_ops()

2010-07-26 20:59:42 -07:00

dst.c

net: avoid RCU for NOCACHE dst

2010-10-20 03:02:23 -07:00

ethtool.c

ethtool: Add support for vlan accleration.

2010-10-21 01:26:54 -07:00

fib_rules.c

fib: remove a useless synchronize_rcu() call

2010-10-16 11:13:22 -07:00

filter.c

net: sk_{detach|attach}_filter() rcu fixes

2010-09-27 21:30:44 -07:00

flow.c

net: return operator cleanup

2010-09-23 14:33:39 -07:00

gen_estimator.c

pkt_sched: remov unnecessary bh_disable

2010-09-10 12:47:59 -07:00

gen_stats.c

…

iovec.c

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

2010-10-04 11:56:38 -07:00

kmap_skb.h

…

link_watch.c

…

Makefile

net: support time stamping in phy devices.

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

neighbour.c

net/neighbour: cancel_delayed_work() + flush_scheduled_work() -> cancel_delayed_work_sync()

2010-10-21 04:25:48 -07:00

net_namespace.c

…

net-sysfs.c

net: Fix rxq ref counting

2010-10-08 14:34:32 -07:00

net-sysfs.h

net: Allow changing number of RX queues after device allocation

2010-09-27 22:09:49 -07:00

net-traces.c

…

netevent.c

…

netpoll.c

netpoll: Revert napi_poll fix for bonding driver

2010-10-20 01:44:30 -07:00

pktgen.c

net: core: use kernel's converter from hex to bin

2010-09-21 18:04:45 -07:00

request_sock.c

…

rtnetlink.c

rtnetlink: remove rtnl_kill_links

2010-10-21 03:09:45 -07:00

scm.c

…

skbuff.c

net: allocate skbs on local node

2010-10-16 11:13:19 -07:00

sock.c

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

2010-09-27 01:03:03 -07:00

stream.c

net: Fix the condition passed to sk_wait_event()

2010-10-03 20:41:32 -07:00

sysctl_net_core.c

…

timestamping.c

net: support time stamping in phy devices.

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

user_dma.c

…

utils.c

net: return operator cleanup

2010-09-23 14:33:39 -07:00