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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4e47dcf d4a4f75)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 8 Jun 2015 17:57:51 +0000 (10:57 -0700)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 8 Jun 2015 17:57:51 +0000 (10:57 -0700)
commit	19915e623458004547c1c2490b09bb923fe69337
tree	b794a81ddf083ed08a5bb32820c2dd0121ed74b2	tree \| snapshot
parent	4e47dcf78d2fa0b6316b6d563a055fdcc93bd222	commit \| diff
parent	d4a4f75cd8f29cd9464a5a32e9224a91571d6649	commit \| diff

Merge 4.1-rc7 into usb-next

This resolves a merge issue in musb_core.c and we want the fixes that
were in Linus's tree in this branch as well for testing.

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/phy/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/phy/phy-core.c	diff1 \|	diff2 \|	blob \| history
drivers/phy/phy-rcar-gen2.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/dwc3/core.h	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/function/f_fs.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/udc/s3c2410_udc.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci.h	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/musb_core.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/phy/phy-ab8500-usb.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree