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

Conflicts:
	drivers/net/stmmac/stmmac_main.c
	drivers/net/wireless/wl12xx/wl1271_cmd.c
	drivers/net/wireless/wl12xx/wl1271_main.c
	drivers/net/wireless/wl12xx/wl1271_spi.c
	net/core/ethtool.c
	net/mac80211/scan.c

2010-04-11 14:53:53 -07: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

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

br2684.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

clip.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

common.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

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

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

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

lec.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

lec.h

lec: convert to internal network_device_stats

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

Makefile

[ATM]: Kill ipcommon.[ch]

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

mpc.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

mpc.h

atm: convert mpc device to using netdev_ops

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

mpoa_caches.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

mpoa_caches.h

[NET] ATM: Fix whitespace errors.

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

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

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

proc.c

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

2010-04-11 14:53:53 -07:00

protocols.h

Linux-2.6.12-rc2

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

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

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.h

atm: 32-bit ioctl compatibility

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

signaling.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

signaling.h

[NET] ATM: Fix whitespace errors.

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

svc.c

net/atm/svc.c: checkpatch cleanups

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