android_kernel_motorola_sm6225/net/phonet
David S. Miller 198d6ba4d7 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/isdn/i4l/isdn_net.c
	fs/cifs/connect.c
2008-11-18 23:38:23 -08:00
..
af_phonet.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-11-18 23:38:23 -08:00
datagram.c Phonet: Phonet datagram transport protocol 2008-09-22 20:05:57 -07:00
Kconfig
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