David S. Miller 4a35ecf8bf Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/bonding/bond_main.c
	drivers/net/via-velocity.c
	drivers/net/wireless/iwlwifi/iwl-agn.c

2010-04-06 23:53:30 -07:00

..

core

sysfs: fix sysfs lockdep warning in infiniband code

2010-03-19 07:12:13 -07:00

hw

net: convert multicast list to list_head

2010-04-03 14:22:15 -07:00

ulp

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-04-06 23:53:30 -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