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

2008-11-20 16:44:00 -08:00

..

af_phonet.c

phonet: fix compilation with gcc-3.4

2008-11-19 14:17:41 -08:00

datagram.c

Phonet: Phonet datagram transport protocol

2008-09-22 20:05:57 -07:00

Kconfig

Phonet: add CONFIG_PHONET

2008-09-22 20:03:00 -07:00

Makefile

Phonet: implement GPRS virtual interface over PEP socket

2008-10-05 11:16:16 -07:00

pep-gprs.c

Phonet: use net_device built-in stats for GPRS

2008-11-10 16:21:05 -08:00

pep.c

Phonet: implement GPRS virtual interface over PEP socket

2008-10-05 11:16:16 -07:00

pn_dev.c

Phonet: network device and address handling

2008-09-22 20:03:44 -07:00

pn_netlink.c

Phonet: Netlink factorization and cleanup

2008-09-30 02:51:18 -07:00

socket.c

Phonet: implement GPRS virtual interface over PEP socket

2008-10-05 11:16:16 -07:00

sysctl.c

net: '&' redux

2008-11-03 18:21:05 -08:00