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

author	Roland Dreier <roland@purestorage.com>
	Mon, 1 Oct 2012 09:11:12 +0000 (02:11 -0700)
committer	Roland Dreier <roland@purestorage.com>
	Mon, 1 Oct 2012 09:11:12 +0000 (02:11 -0700)
commit	8d68d2801d6ac5209752a58a8fad8460f3d550a5
tree	c53a42c60afe1d3d8d587372de221011f7682d93	tree \| snapshot
parent	2a22fb8c69275903b8be4c6203aa08bfac374844	commit \| diff
parent	c079c28714e4d1a0b7cad120f84217e0fcde09a6	commit \| diff
parent	bea1e22df494a729978e7f2c54f7bda328f74bc3	commit \| diff
parent	a084feebd24764fab9657a586ea65484ddbd79cf	commit \| diff
parent	aadf4f3f66a7b710b05b31ac0839fbbf59e41f7c	commit \| diff
parent	bca1935ccdecf2354a55d9edab4c022a995ee490	commit \| diff
parent	e20d583818a5d6fc052e59fe2345d82ffd089462	commit \| diff
parent	d8536670916a685df116b5c2cb256573fd25e4e3	commit \| diff

Merge branches 'cma', 'cxgb4', 'ipoib', 'mlx4', 'mlx4-sriov', 'nes', 'qib' and 'srp' into for-next

drivers/infiniband/hw/mlx4/qp.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/fw.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history