git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 445cc36 86ccdc0)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 10 Jun 2014 02:13:26 +0000 (12:13 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 10 Jun 2014 02:13:26 +0000 (12:13 +1000)
commit	fb49ae11639c381322d8ff20029dc15a3f1d346e
tree	1c200fc5014bfddc5d40282d67f20f3b90f42ca4	tree \| snapshot
parent	445cc36beb24c9117ff1ea3836a72a8d5291fa19	commit \| diff
parent	86ccdc0c96a05e845ec79e8ff6a15e642b0195ab	commit \| diff

Merge remote-tracking branch 'infiniband/for-next'

Conflicts:
drivers/net/ethernet/mellanox/mlx4/cmd.c

15 files changed:

drivers/infiniband/hw/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx4/mlx4_ib.h	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx4/qp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/cq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/fw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/mlx4.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/mr.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/qp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/mr.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx4/device.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules