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

Conflicts:
	drivers/net/yellowfin.c

2009-09-02 00:32:56 -07:00

..

alloc.c

…

catas.c

mlx4_core: Add link type autosensing

2009-03-18 19:45:11 -07:00

cmd.c

mlx4_core: Handle multi-physical function devices

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

cq.c

…

en_cq.c

mlx4_en: Fix partial rings feature

2009-05-25 00:35:53 -07:00

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

mlx4_en: Not using Shared Receive Queues

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

en_port.c

mlx4_en: Move to SW counters for total bytes and packets

2009-04-21 01:47:07 -07:00

en_port.h

…

en_resources.c

mlx4_en: Not using Shared Receive Queues

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

en_rx.c

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

2009-08-12 17:44:53 -07:00

en_tx.c

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

2009-09-02 00:32:56 -07:00

eq.c

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

2009-06-15 03:02:23 -07:00

fw.c

…

fw.h

…

icm.c

…

icm.h

…

intf.c

…

main.c

mlx4_core: Add new ConnectX EN PCI ID 0x6764

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

Makefile

mlx4_en renamed en_params.c to en_ethtool.c

2009-06-02 02:29:04 -07:00

mcg.c

…

mlx4_en.h

netdev: convert bulk of drivers to netdev_tx_t

2009-09-01 01:14:07 -07:00

mlx4.h

mlx4_core: Add link type autosensing

2009-03-18 19:45:11 -07:00

mr.c

mlx4_core: Fix dma_sync_single_for_cpu() with matching for_device() calls

2009-06-22 23:07:56 -07:00

pd.c

…

port.c

mlx4_core: Don't leak mailbox for SET_PORT on Ethernet ports

2009-03-31 09:54:15 -07:00

profile.c

mlx4_core: Add module parameter for number of MTTs per segment

2009-05-27 14:38:34 -07:00

qp.c

…

reset.c

…

sense.c

workqueue: add to_delayed_work() helper function

2009-04-02 19:04:50 -07:00

srq.c

…