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

[PATCH] remove many unneeded #includes of sched.h

2007-02-14 08:09:54 -08:00

addr.h

[ATM]: add support for LECS addresses learned from network

2005-10-06 22:19:28 -07:00

atm_misc.c

[ATM]: atm_pcr_goal() doesn't modify its argument's contents -- mark it as const

2005-11-29 16:13:55 -08:00

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

[NET]: Introduce SIOCGSTAMPNS ioctl to get timestamps with nanosec resolution

2007-04-25 22:24:04 -07:00

Kconfig

[ATM]: atm is no longer experimental

2008-01-28 15:00:11 -08:00

lec_arpc.h

[ATM]: [lec] add reference counting to lec_arp entries

2006-09-29 17:16:48 -07:00

lec.c

Merge branch 'master' of ../net-2.6/

2008-03-23 22:54:03 -07:00

lec.h

[NET] ATM: Fix whitespace errors.

2007-02-10 23:19:16 -08:00

Makefile

[ATM]: Kill ipcommon.[ch]

2006-12-02 21:32:08 -08:00

mpc.c

[ATM]: Check IP header validity in mpc_send_packet

2008-01-09 03:51:59 -08:00

mpc.h

[NET] ATM: Fix whitespace errors.

2007-02-10 23:19:16 -08:00

mpoa_caches.c

[NET] ATM: Fix whitespace errors.

2007-02-10 23:19:16 -08:00

mpoa_caches.h

[NET] ATM: Fix whitespace errors.

2007-02-10 23:19:16 -08:00

mpoa_proc.c

[ATM]: Use proc_create() to setup ->proc_fops first

2008-02-28 13:55:45 -08:00

pppoatm.c

[ATM]: Replace DPRINTK() with pr_debug().

2007-10-10 16:48:27 -07:00

proc.c

[ATM]: Use seq_open/release_privade instead of manual manipulations.

2008-02-29 11:37:02 -08:00

protocols.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

pvc.c

[NET]: Make socket creation namespace safe.

2007-10-10 16:49:07 -07:00

raw.c

[ATM]: Replace DPRINTK() with pr_debug().

2007-10-10 16:48:27 -07:00

resources.c

[NET] ATM: Fix whitespace errors.

2007-02-10 23:19:16 -08:00

resources.h

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

signaling.c

[NET]: sparse warning fixes

2007-10-10 16:54:48 -07:00

signaling.h

[NET] ATM: Fix whitespace errors.

2007-02-10 23:19:16 -08:00

svc.c

[NET]: Make socket creation namespace safe.

2007-10-10 16:49:07 -07:00