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

Conflicts:

	drivers/isdn/i4l/isdn_net.c
	fs/cifs/connect.c

2008-11-18 23:38:23 -08:00

..

alloc.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

2008-10-23 08:16:03 -07:00

catas.c

…

cmd.c

…

cq.c

…

en_cq.c

…

en_main.c

mlx4_en: remove duplicated #include

2008-10-27 14:50:00 -04:00

en_netdev.c

mlx4_en: Pause parameters per port

2008-11-15 13:52:07 -08:00

en_params.c

mlx4_en: Pause parameters per port

2008-11-15 13:52:07 -08:00

en_port.c

…

en_port.h

…

en_resources.c

…

en_rx.c

drivers/net: Kill now superfluous ->last_rx stores.

2008-11-03 21:11:17 -08:00

en_tx.c

…

eq.c

…

fw.c

mlx4: Setting the correct offset for default mac address

2008-10-27 14:50:03 -04:00

fw.h

…

icm.c

…

icm.h

…

intf.c

…

main.c

…

Makefile

…

mcg.c

net: replace %p6 with %pI6

2008-10-29 12:52:50 -07:00

mlx4_en.h

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

2008-11-18 23:38:23 -08:00

mlx4.h

mlx4_core: Fix unused variable warning

2008-11-04 11:18:56 -08:00

mr.c

…

pd.c

…

port.c

…

profile.c

…

qp.c

…

reset.c

…

srq.c

…