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

..

alloc.c

mlx4: use bitmap_find_next_zero_area

2009-12-16 07:20:19 -08:00

catas.c

mlx4: Fix access to freed memory

2009-09-16 00:00:21 -07:00

cmd.c

mlx4_core: Handle multi-physical function devices

2009-07-06 16:10:03 -07:00

cq.c

mlx4_core: Remove unnecessary includes of <linux/init.h>

2009-09-05 20:24:49 -07:00

en_cq.c

…

en_ethtool.c

drivers/net/mlx4: Adjust constant

2009-07-21 13:00:46 -07:00

en_main.c

mlx4_en: Using real number of rings as RSS map size

2009-08-06 19:27:51 -07:00

en_netdev.c

net: convert multicast list to list_head

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

en_port.c

…

en_port.h

…

en_resources.c

mlx4_en: Not using Shared Receive Queues

2009-08-06 19:28:18 -07:00

en_rx.c

mlx4: replace the dma_sync_single_range_for_cpu/device API

2010-02-19 13:19:51 -08:00

en_tx.c

tree-wide: fix assorted typos all over the place

2009-12-04 15:39:55 +01:00

eq.c

mlx4_core: Distinguish multiple devices in /proc/interrupts

2009-09-05 20:24:50 -07:00

fw.c

mlx4_core: Fix parsing of reserved EQ cap

2009-11-12 15:51:16 -08:00

fw.h

…

icm.c

mlx4_core: Remove unnecessary includes of <linux/init.h>

2009-09-05 20:24:49 -07:00

icm.h

…

intf.c

…

main.c

sysfs: fix sysfs lockdep warning in mlx4 code

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

Makefile

…

mcg.c

mlx4_core: Remove unnecessary includes of <linux/init.h>

2009-09-05 20:24:49 -07:00

mlx4_en.h

net: convert multiple drivers to use netdev_for_each_mc_addr, part7

2010-03-16 21:23:25 -07:00

mlx4.h

mlx4_core: Allocate and map sufficient ICM memory for EQ context

2009-09-05 20:24:49 -07:00

mr.c

mlx4_core: Remove unnecessary includes of <linux/init.h>

2009-09-05 20:24:49 -07:00

pd.c

mlx4_core: Remove unnecessary includes of <linux/init.h>

2009-09-05 20:24:49 -07:00

port.c

…

profile.c

mlx4_core: Remove unnecessary includes of <linux/init.h>

2009-09-05 20:24:49 -07:00

qp.c

mlx4_core: Remove unnecessary includes of <linux/init.h>

2009-09-05 20:24:49 -07:00

reset.c

mlx4_core: Remove unnecessary includes of <linux/init.h>

2009-09-05 20:24:49 -07:00

sense.c

mlx4_core: return a negative error value

2009-12-13 19:47:42 -08:00

srq.c

mlx4_core: Remove unnecessary includes of <linux/init.h>

2009-09-05 20:24:49 -07:00