David S. Miller 08abe18af1 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ... Conflicts: drivers/net/wimax/i2400m/usb-notif.c		2009-03-26 15:23:24 -07:00
..
core	infiniband: struct device - replace bus_id with dev_name(), dev_set_name()	2009-01-06 10:44:39 -08:00
hw	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-03-26 15:23:24 -07:00
ulp	infiniband: convert ipoib to net_device_ops	2009-03-21 19:19:14 -07:00
Kconfig	RDMA/addr: Fix build breakage when IPv6 is disabled	2008-12-29 23:37:14 -08:00
Makefile	RDMA/nes: Add a driver for NetEffect RNICs	2008-02-04 20:20:45 -08:00