David S. Miller 11fe883936 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/vhost/net.c net/bridge/br_device.c Fix merge conflict in drivers/vhost/net.c with guidance from Stephen Rothwell. Revert the effects of net-2.6 commit 573201f36f since net-next-2.6 has fixes that make bridge netpoll work properly thus we don't need it disabled. Signed-off-by: David S. Miller <davem@davemloft.net>		2010-07-20 18:25:24 -07:00
..
datagram.c	net/core: EXPORT_SYMBOL cleanups	2010-07-12 12:57:55 -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-07-20 18:25:24 -07:00
drop_monitor.c	drop_monitor: Add error code to detect duplicate state changes	2010-07-20 13:28:04 -07:00
dst.c	__dst_free(): put EXPORT_SYMBOLS after the fct	2010-07-20 13:28:03 -07:00
ethtool.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-07-07 15:59:38 -07:00
fib_rules.c
filter.c	net: optimize Berkeley Packet Filter (BPF) processing	2010-06-25 21:33:12 -07:00
flow.c	net/core: EXPORT_SYMBOL cleanups	2010-07-12 12:57:55 -07:00
gen_estimator.c	pkt_sched: gen_kill_estimator() rcu fixes	2010-06-11 18:37:08 -07:00
gen_stats.c	net/core: EXPORT_SYMBOL cleanups	2010-07-12 12:57:55 -07:00
iovec.c	net/core: EXPORT_SYMBOL cleanups	2010-07-12 12:57:55 -07:00
kmap_skb.h
link_watch.c	net/core: EXPORT_SYMBOL cleanups	2010-07-12 12:57:55 -07:00
Makefile	net: support time stamping in phy devices.	2010-07-18 19:15:26 -07:00
neighbour.c	net/core: neighbour update Oops	2010-07-14 18:02:16 -07:00
net_namespace.c
net-sysfs.c	net/core: EXPORT_SYMBOL cleanups	2010-07-12 12:57:55 -07:00
net-sysfs.h
net-traces.c
netevent.c	net/core: EXPORT_SYMBOL cleanups	2010-07-12 12:57:55 -07:00
netpoll.c	net/core: EXPORT_SYMBOL cleanups	2010-07-12 12:57:55 -07:00
pktgen.c	net/core: Remove unnecessary casts of private_data	2010-07-12 21:13:36 -07:00
request_sock.c
rtnetlink.c	net/core: EXPORT_SYMBOL cleanups	2010-07-12 12:57:55 -07:00
scm.c	net/core: EXPORT_SYMBOL cleanups	2010-07-12 12:57:55 -07:00
skbuff.c	net/core: EXPORT_SYMBOL cleanups	2010-07-12 12:57:55 -07:00
sock.c	net: this_cpu_xxx conversions	2010-07-19 15:12:51 -07:00
stream.c	net/core: EXPORT_SYMBOL cleanups	2010-07-12 12:57:55 -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/core: EXPORT_SYMBOL cleanups	2010-07-12 12:57:55 -07:00