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

..

af_phonet.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

datagram.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

Kconfig

trivial: fix typos/grammar errors in Kconfig texts

2009-03-30 15:22:01 +02:00

Makefile

…

pep-gprs.c

Phonet: zero-copy aligned GPRS RX

2010-01-07 00:24:54 -08:00

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

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

socket.c

net: sock_def_readable() and friends RCU conversion

2010-05-01 15:00:15 -07:00

sysctl.c

sysctl net: Remove unused binary sysctl code

2009-11-12 02:05:06 -08:00