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 573201f36fd9c7c6d5218cdcd9948cee700b277d
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

..

dsa_priv.h

…

dsa.c

…

Kconfig

dsa: Fix Kconfig dependencies.

2010-07-12 20:03:42 -07:00

Makefile

…

mv88e6xxx.c

…

mv88e6xxx.h

…

mv88e6060.c

…

mv88e6123_61_65.c

…

mv88e6131.c

…

slave.c

net: preserve ifreq parameter when calling generic phy_mii_ioctl().

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

tag_dsa.c

…

tag_edsa.c

…

tag_trailer.c

…