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

..

21142.c

tulip/21142.c: Use dev_<level> and pr_<level>

2010-01-31 23:26:52 -08:00

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

de4x5.h

de4x5: Remove developer debug feature about set/clear promisc

2008-07-22 16:09:09 -04:00

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

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

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

interrupt.c

tulip/interrupt.c: Use dev_<level> and pr_<level>

2010-01-31 23:26:54 -08:00

Kconfig

dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips

2010-01-07 17:27:31 -08:00

Makefile

remove the obsolete xircom_tulip_cb driver

2008-03-17 07:49:23 -04:00

media.c

tulip/media.c: Use dev_<level> and pr_<level>

2010-01-31 23:26:55 -08:00

pnic2.c

tulip/pnic2.c: Use dev_<level> and pr_<level>

2010-01-31 23:26:56 -08:00

pnic.c

tulip/pnic.c: Use dev_<level> and pr_<level>

2010-01-31 23:26:55 -08:00

timer.c

tulip/timer.c: Use dev_<level> and pr_<level>

2010-01-31 23:26:56 -08:00

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

tulip.h

tulip: Fix for MTU problems with 802.1q tagged frames

2009-03-13 15:43:38 -07:00

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

winbond-840.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

xircom_cb.c

net/tulip: remove trailing space in messages

2010-03-24 14:10:14 -07:00