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

..

af_phonet.c

…

datagram.c

…

Kconfig

…

Makefile

…

pep-gprs.c

…

pep.c

Phonet: fix skb leak in pipe endpoint accept()

2010-07-08 21:45:34 -07:00

pn_dev.c

phonet: use call_rcu for phonet device free

2010-06-09 16:14:25 -07:00

pn_netlink.c

…

socket.c

…

sysctl.c

…