git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	Doug Ledford <dledford@redhat.com>
	Fri, 18 Aug 2017 18:12:04 +0000 (14:12 -0400)
committer	Doug Ledford <dledford@redhat.com>
	Fri, 18 Aug 2017 18:12:04 +0000 (14:12 -0400)
commit	b0e32e20e3c63778d8c20a40d8bec8b18baffecb
tree	2e0c3311c53889473b94d49132fe5b7cdee71d51	tree \| snapshot
parent	d3cf4d9915c4fb60aeef580973aa77420e600746	commit \| diff
parent	870201f95fcbd19538aef630393fe9d583eff82e	commit \| diff

Merge branch 'k.o/for-4.13-rc' into k.o/for-next

Merging our (hopefully) final -rc pull branch into our for-next branch
because some of our pending patches won't apply cleanly without having
the -rc patches in our tree.

Signed-off-by: Doug Ledford <dledford@redhat.com>

John Crispins staging tree

RSS Atom

drivers/infiniband/core/addr.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/device.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/uverbs_cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/verbs.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hns/hns_roce_hw_v1.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/i40iw/i40iw_puda.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/ipoib.h	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/ipoib_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/ipoib_main.c	diff1 \|	diff2 \|	blob \| history