git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e5abb59 a1924d8)

author	Thierry Reding <treding@nvidia.com>
	Fri, 25 Oct 2013 09:48:10 +0000 (11:48 +0200)
committer	Thierry Reding <treding@nvidia.com>
	Fri, 25 Oct 2013 09:48:10 +0000 (11:48 +0200)
commit	9625115d6c677c1bbb61a547e4bd9cedd12ab75d
tree	1c63cc3b1858312836ea357dc4946f04213d61ec	tree \| snapshot
parent	e5abb592b918ce7100512d0ebf4c6e0e18fe7a35	commit \| diff
parent	a1924d8a1da261293f81483fdad1e1af4ec47637	commit \| diff

Merge remote-tracking branch 'usb/usb-next'

Conflicts:
drivers/Kconfig
drivers/usb/musb/davinci.c

17 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3beagle.c	diff1 \|	diff2 \|	blob \| history
drivers/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/usb/chipidea/ci_hdrc_imx.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/storage_common.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-exynos.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-octeon.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-ppc-of.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-tegra.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-at91.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-exynos.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-nxp.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-omap3.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-pxa27x.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-spear.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/uhci-platform.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules