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

Conflicts:

	drivers/net/wireless/ath9k/core.c
	drivers/net/wireless/ath9k/main.c
	net/core/dev.c

2008-10-01 06:12:56 -07:00

..

alloc.c

drivers/net/mlx4/alloc.c needs mm.h

2008-09-24 18:48:57 -04:00

catas.c

mlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files

2008-07-25 10:32:52 -07:00

cmd.c

mlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files

2008-07-25 10:32:52 -07:00

cq.c

mlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files

2008-07-25 10:32:52 -07:00

eq.c

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

2008-07-26 20:40:36 -07:00

fw.c

mlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files

2008-07-25 10:32:52 -07:00

fw.h

mlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files

2008-07-25 10:32:52 -07:00

icm.c

mlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files

2008-07-25 10:32:52 -07:00

icm.h

mlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files

2008-07-25 10:32:52 -07:00

intf.c

mlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files

2008-07-25 10:32:52 -07:00

main.c

mlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files

2008-07-25 10:32:52 -07:00

Makefile

…

mcg.c

mlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files

2008-07-25 10:32:52 -07:00

mlx4.h

mlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files

2008-07-25 10:32:52 -07:00

mr.c

IB/mlx4: Fix up fast register page list format

2008-09-15 14:25:23 -07:00

pd.c

mlx4_core: Improve error message when not enough UAR pages are available

2008-07-23 08:12:47 -07:00

profile.c

…

qp.c

mlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files

2008-07-25 10:32:52 -07:00

reset.c

mlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files

2008-07-25 10:32:52 -07:00

srq.c

mlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files

2008-07-25 10:32:52 -07:00