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

Conflicts:

	drivers/net/wireless/ath5k/base.c
	net/8021q/vlan_core.c

2008-11-06 22:43:03 -08:00

..

fec.h

…

fs_enet-main.c

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

2008-11-06 22:43:03 -08:00

fs_enet.h

fs-enet: remove code associated with !CONFIG_PPC_MERGE

2008-09-24 22:11:57 -04:00

Kconfig

…

mac-fcc.c

fs-enet: remove code associated with !CONFIG_PPC_MERGE

2008-09-24 22:11:57 -04:00

mac-fec.c

fs-enet: remove code associated with !CONFIG_PPC_MERGE

2008-09-24 22:11:57 -04:00

mac-scc.c

fs-enet: remove code associated with !CONFIG_PPC_MERGE

2008-09-24 22:11:57 -04:00

Makefile

fs_enet: Remove !CONFIG_PPC_CPM_NEW_BINDING code

2008-07-16 17:57:49 -05:00

mii-bitbang.c

phylib: move to dynamic allocation of struct mii_bus

2008-10-08 16:29:57 -07:00

mii-fec.c

phylib: move to dynamic allocation of struct mii_bus

2008-10-08 16:29:57 -07:00