You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		15 years ago
..
Kconfig	trivial: fix typos/grammar errors in Kconfig texts	16 years ago
Makefile	Phonet: implement GPRS virtual interface over PEP socket	17 years ago
af_phonet.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
datagram.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
pep-gprs.c	Phonet: zero-copy aligned GPRS RX	15 years ago
pep.c	Phonet: fix skb leak in pipe endpoint accept()	15 years ago
pn_dev.c	phonet: use call_rcu for phonet device free	15 years ago
pn_netlink.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
socket.c	net: sock_def_readable() and friends RCU conversion	15 years ago
sysctl.c	sysctl net: Remove unused binary sysctl code	15 years ago