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

author	Kalle Valo <kvalo@codeaurora.org>
	Mon, 17 Sep 2018 14:41:02 +0000 (17:41 +0300)
committer	Kalle Valo <kvalo@codeaurora.org>
	Mon, 17 Sep 2018 14:41:02 +0000 (17:41 +0300)
commit	43e2f2904160b9a95aad77df9cbc1622910b8598
tree	d2608ffbd2488b0d1e6dbeaad7bc489fe452ad3a	tree \| snapshot
parent	cf5652c962dae3bff1e256be7eba142b067e74ba	commit \| diff
parent	3341ba9f0f2637a51738ef5de5114e13a1cd3eca	commit \| diff

Merge wireless-drivers into wireless-drivers-next

Solve the conflict in main.c early on as there will be a lot more mt76 patches
in the queue.

John Crispins staging tree