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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 192fef1 949db15)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Fri, 25 Jan 2013 20:41:02 +0000 (12:41 -0800)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Fri, 25 Jan 2013 20:41:02 +0000 (12:41 -0800)
commit	67635d397a643514fdfa859f611b86bd3ad8958d
tree	b5df6d79b35cde39c00f0cc1432f128f473d4d6e	tree \| snapshot
parent	192fef18d0f5ac9a05a93ff6314fc9865c10fbf9	commit \| diff
parent	949db153b6466c6f7cad5a427ecea94985927311	commit \| diff

Merge 3.8-rc5 into usb-next

This fixes up a conflict with drivers/usb/serial/io_ti.c that came up in
linux-next.

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/usb/dwc3/gadget.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/f_fs.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/fsl_udc_core.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-mxc.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/uhci-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/option.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree