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
..
core	RDMA/cma: Simplify locking needed for serialization of callbacks	17 years ago
hw	Merge branch 'core/rcu' into core/rcu-for-linus	17 years ago
ulp	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	17 years ago
Kconfig	RDMA/nes: Add a driver for NetEffect RNICs	17 years ago
Makefile	RDMA/nes: Add a driver for NetEffect RNICs	17 years ago