You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David S. Miller ea2aca084b Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wan/hdlc_fr.c drivers/net/wireless/iwlwifi/iwl-4965.c drivers/net/wireless/iwlwifi/iwl3945-base.c		17 years ago
..
Kconfig	[FS_ENET]: Fix module build.	17 years ago
Makefile	[FS_ENET]: Fix module build.	17 years ago
fec.h	…
fs_enet-main.c	fs_enet: MDIO on GPIO support	17 years ago
fs_enet.h	[POWERPC] CPM: Rename commproc to cpm1 and cpm2_common.c to cpm2.c	17 years ago
mac-fcc.c	fs_enet: restore promiscuous and multicast settings in restart()	17 years ago
mac-fec.c	[POWERPC] CPM: Rename commproc to cpm1 and cpm2_common.c to cpm2.c	17 years ago
mac-scc.c	[POWERPC] CPM: Rename commproc to cpm1 and cpm2_common.c to cpm2.c	17 years ago
mii-bitbang.c	phy: Change mii_bus id field to a string	17 years ago
mii-fec.c	fs_enet: Fix a memory leak in fs_enet_mdio_probe	17 years ago