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 6ab33d5171 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/ixgbe/ixgbe_main.c include/net/mac80211.h net/phonet/af_phonet.c		16 years ago
..
Kconfig	Phonet: add CONFIG_PHONET	17 years ago
Makefile	Phonet: implement GPRS virtual interface over PEP socket	17 years ago
af_phonet.c	phonet: fix compilation with gcc-3.4	16 years ago
datagram.c	Phonet: Phonet datagram transport protocol	17 years ago
pep-gprs.c	Phonet: use net_device built-in stats for GPRS	16 years ago
pep.c	Phonet: implement GPRS virtual interface over PEP socket	17 years ago
pn_dev.c	Phonet: network device and address handling	17 years ago
pn_netlink.c	Phonet: Netlink factorization and cleanup	17 years ago
socket.c	Phonet: implement GPRS virtual interface over PEP socket	17 years ago
sysctl.c	net: '&' redux	16 years ago