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

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Tue, 7 Apr 2015 09:17:34 +0000 (11:17 +0200)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Tue, 7 Apr 2015 09:17:34 +0000 (11:17 +0200)
commit	b7a4abb67416aa07cd65446dd39e64525ccfe8e5
tree	8f5b0f9ffb617622944b5e6368473f91e3efeaa4	tree \| snapshot
parent	d30323f810e4da94eb75cf4bfe5165b9518c64df	commit \| diff
parent	f22e6e847115abc3a0e2ad7bb18d243d42275af1	commit \| diff

Merge 4.0-rc7 into usb-next

We want the fixes in here, and to help resolve merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>