David S. Miller 8decf86879 Merge branch 'master' of github.com:davem330/net ...

Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c

2011-09-22 03:23:13 -04: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

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

atm_sysfs.c

atm: expose ATM device index in sysfs

2011-05-27 13:07:21 -04:00

br2684.c

atm: br2684: Fix oops due to skb->dev being NULL

2011-08-20 14:13:05 -07:00

clip.c

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

common.c

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -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

[ATM]: atm is no longer experimental

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

lec_arpc.h

…

lec.c

net: remove use of ndo_set_multicast_list in drivers

2011-08-17 20:22:03 -07:00

lec.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

Makefile

…

mpc.c

net: Remove casts of void *

2011-06-16 23:19:27 -04: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

net: remove interrupt.h inclusion from netdevice.h

2011-06-06 22:55:11 -07:00

proc.c

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07: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