David S. Miller eb14f01959 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:

	drivers/net/e1000e/ich8lan.c

2008-12-15 20:03:50 -08:00

..

af_phonet.c

Phonet: basic net namespace support

2008-12-03 15:42:56 -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

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2008-12-15 20:03:50 -08:00

pep.c

Phonet: implement GPRS virtual interface over PEP socket

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

pn_dev.c

Phonet: basic net namespace support

2008-12-03 15:42:56 -08:00

pn_netlink.c

Phonet: do not dump addresses from other namespaces

2008-12-03 15:42:09 -08:00

socket.c

Phonet: basic net namespace support

2008-12-03 15:42:56 -08:00

sysctl.c

net: Make static

2008-12-10 15:18:31 -08:00