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

Conflicts:
	drivers/net/bnx2x/bnx2x.h
	drivers/net/wireless/iwlwifi/iwl-1000.c
	drivers/net/wireless/iwlwifi/iwl-6000.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/vhost/vhost.c

2010-12-17 12:27:22 -08:00

..

addr.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

addr.h

atm: use const where reasonable

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

atm_misc.c

net/atm/atm_misc.c: checkpatch cleanups

2010-01-26 21:15:57 -08:00

atm_sysfs.c

atm: correct sysfs 'device' link creation and parent relationships

2010-12-10 15:45:05 -08:00

br2684.c

net/atm: Remove unnecessary casts of netdev_priv

2010-11-17 10:37:52 -08:00

clip.c

net: use the macros defined for the members of flowi

2010-11-17 12:27:45 -08:00

common.c

net/atm: Adjust confusing if indentation

2010-08-16 21:06:26 -07:00

common.h

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

ioctl.c

net/atm/ioctl.c: checkpatch cleanups

2010-01-26 21:15:59 -08:00

Kconfig

…

lec_arpc.h

…

lec.c

net/atm: Remove unnecessary casts of netdev_priv

2010-11-17 10:37:52 -08:00

lec.h

lec: convert to internal network_device_stats

2009-01-21 14:02:00 -08:00

Makefile

…

mpc.c

ATM: mpc, fix use after free

2010-10-11 11:05:42 -07:00

mpc.h

atm: convert mpc device to using netdev_ops

2009-03-21 19:19:12 -07:00

mpoa_caches.c

net: Remove unnecessary returns from void function()s

2010-05-17 23:23:14 -07:00

mpoa_caches.h

…

mpoa_proc.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

pppoatm.c

ppp: make channel_ops const

2010-08-04 21:53:17 -07:00

proc.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

protocols.h

…

pvc.c

net/atm/pvc.c: checkpatch cleanups

2010-01-26 21:16:02 -08:00

raw.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

resources.c

atm: correct sysfs 'device' link creation and parent relationships

2010-12-10 15:45:05 -08:00

resources.h

atm: correct sysfs 'device' link creation and parent relationships

2010-12-10 15:45:05 -08:00

signaling.c

net: sk_sleep() helper

2010-04-20 16:37:13 -07:00

signaling.h

…

svc.c

net: sk_sleep() helper

2010-04-20 16:37:13 -07:00