tmp_suning_uos_patched/net/atm
David S. Miller 06802a819a Merge branch 'master' of ../net-2.6/
Conflicts:

	net/ipv6/ndisc.c
2008-03-23 22:54:03 -07:00
..
addr.c
addr.h
atm_misc.c
atm_sysfs.c [ATM]: Convert struct class_device to struct device 2008-01-28 15:00:12 -08:00
br2684.c [ATM]: Use proc_create() to setup ->proc_fops first 2008-02-28 13:55:45 -08:00
clip.c Merge branch 'master' of ../net-2.6/ 2008-03-23 22:54:03 -07:00
common.c [NET]: Name magic constants in sock_wake_async() 2008-01-28 14:55:03 -08:00
common.h [NET]: Make socket creation namespace safe. 2007-10-10 16:49:07 -07:00
ioctl.c
Kconfig [ATM]: atm is no longer experimental 2008-01-28 15:00:11 -08:00
lec_arpc.h
lec.c Merge branch 'master' of ../net-2.6/ 2008-03-23 22:54:03 -07:00
lec.h
Makefile
mpc.c [ATM]: Check IP header validity in mpc_send_packet 2008-01-09 03:51:59 -08:00
mpc.h
mpoa_caches.c
mpoa_caches.h
mpoa_proc.c [ATM]: Use proc_create() to setup ->proc_fops first 2008-02-28 13:55:45 -08:00
pppoatm.c
proc.c [ATM]: Use seq_open/release_privade instead of manual manipulations. 2008-02-29 11:37:02 -08:00
protocols.h
pvc.c [NET]: Make socket creation namespace safe. 2007-10-10 16:49:07 -07:00
raw.c
resources.c
resources.h
signaling.c [NET]: sparse warning fixes 2007-10-10 16:54:48 -07:00
signaling.h
svc.c [NET]: Make socket creation namespace safe. 2007-10-10 16:49:07 -07:00