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 49997d7515 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: Documentation/powerpc/booting-without-of.txt drivers/atm/Makefile drivers/net/fs_enet/fs_enet-main.c drivers/pci/pci-acpi.c net/8021q/vlan.c net/iucv/iucv.c		17 years ago
..
Kconfig	…
Makefile	…
fec.h	…
fs_enet-main.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	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	drivers/net: Use linux/of_{device,platform}.h instead of asm	17 years ago
mii-bitbang.c	phy: Change mii_bus id field to a string	17 years ago
mii-fec.c	drivers/net: Use linux/of_{device,platform}.h instead of asm	17 years ago