David S. Miller 871039f02f Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/stmmac/stmmac_main.c drivers/net/wireless/wl12xx/wl1271_cmd.c drivers/net/wireless/wl12xx/wl1271_main.c drivers/net/wireless/wl12xx/wl1271_spi.c net/core/ethtool.c net/mac80211/scan.c		2010-04-11 14:53:53 -07:00
..
core	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2010-04-09 11:53:06 -07:00
hw	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
ulp	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
Kconfig	switch infiniband uverbs to anon_inodes	2010-03-03 14:07:27 -05:00
Makefile	RDMA/nes: Add a driver for NetEffect RNICs	2008-02-04 20:20:45 -08:00