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

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-sta.c

2008-12-05 22:54:40 -08:00

..

addr.c

atm: use const where reasonable

2008-06-17 16:20:06 -07:00

addr.h

atm: use const where reasonable

2008-06-17 16:20:06 -07:00

atm_misc.c

…

atm_sysfs.c

net: struct device - replace bus_id with dev_name(), dev_set_name()

2008-11-10 13:55:14 -08:00

br2684.c

netdevice: safe convert to netdev_priv() #part-4

2008-11-12 23:39:10 -08:00

clip.c

net: replace NIPQUAD() in net/*/

2008-10-31 00:54:56 -07:00

common.c

atm: use const where reasonable

2008-06-17 16:20:06 -07:00

common.h

atm: 32-bit ioctl compatibility

2008-12-03 22:12:38 -08:00

ioctl.c

atm: 32-bit ioctl compatibility

2008-12-03 22:12:38 -08:00

Kconfig

[ATM]: atm is no longer experimental

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

lec_arpc.h

…

lec.c

netdevice: safe convert to netdev_priv() #part-4

2008-11-12 23:39:10 -08:00

lec.h

atm: use const where reasonable

2008-06-17 16:20:06 -07:00

Makefile

…

mpc.c

netdevice: safe convert to netdev_priv() #part-4

2008-11-12 23:39:10 -08:00

mpc.h

…

mpoa_caches.c

net: replace NIPQUAD() in net/*/

2008-10-31 00:54:56 -07:00

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

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

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

proc.c

atm: assign PDE->data before gluing PDE into /proc tree

2008-05-02 04:08:30 -07:00

protocols.h

…

pvc.c

atm: 32-bit ioctl compatibility

2008-12-03 22:12:38 -08:00

raw.c

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

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

resources.c

atm: 32-bit ioctl compatibility

2008-12-03 22:12:38 -08:00

resources.h

atm: 32-bit ioctl compatibility

2008-12-03 22:12:38 -08:00

signaling.c

[NET]: sparse warning fixes

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

signaling.h

…

svc.c

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

2008-12-05 22:54:40 -08:00