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

author	Doug Ledford <dledford@redhat.com>
	Wed, 16 Mar 2016 17:57:43 +0000 (13:57 -0400)
committer	Doug Ledford <dledford@redhat.com>
	Wed, 16 Mar 2016 17:57:43 +0000 (13:57 -0400)
commit	082eaa50838c6b70a8244f8b01d7ed7d686f84db
tree	7ac5de479cf26e6f26c7a30746266d7b222ff3dd	tree \| snapshot
parent	d2ad9cc75963714d04d4596c226a499765950dbf	commit \| diff
parent	a82268b30a8b4b920d0bad24472cbb000c8e734a	commit \| diff
parent	3021376d6d12dd1be8a0a13c16dae8badb7766fd	commit \| diff
parent	dafb5587178afe8abf85f3ae91bbc88de9e54782	commit \| diff

Merge branches 'nes', 'cxgb4' and 'iwpm' into k.o/for-4.6

drivers/infiniband/hw/cxgb4/cm.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/infiniband/hw/cxgb4/device.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/infiniband/hw/cxgb4/iw_cxgb4.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/infiniband/hw/cxgb4/mem.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/infiniband/hw/cxgb4/provider.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/infiniband/hw/cxgb4/qp.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/infiniband/hw/nes/nes_cm.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/infiniband/hw/nes/nes_verbs.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history