]> git.karo-electronics.de Git - karo-tx-linux.git/commit - include/acpi/acpixf.h
Merge remote-tracking branch 'usb/usb-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:59:20 +0000 (14:59 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:59:20 +0000 (14:59 +0200)
commit06fe40dcff8a82d56520bd661f0284321bd6e4db
treeba47f16c2d63428f12d4e90ebb990eab5161b1c8
parentbd1db62a010bba690a50738758f017ba563ce459
parente3967e7b28de70d28313cc93d831d8525083097f
Merge remote-tracking branch 'usb/usb-next'

Conflicts:
drivers/Kconfig
15 files changed:
MAINTAINERS
drivers/Kconfig
drivers/Makefile
drivers/usb/chipidea/ci_hdrc_imx.c
drivers/usb/host/ehci-exynos.c
drivers/usb/host/ehci-octeon.c
drivers/usb/host/ehci-ppc-of.c
drivers/usb/host/ehci-tegra.c
drivers/usb/host/ohci-at91.c
drivers/usb/host/ohci-exynos.c
drivers/usb/host/ohci-nxp.c
drivers/usb/host/ohci-omap3.c
drivers/usb/host/ohci-pxa27x.c
drivers/usb/host/ohci-spear.c
drivers/usb/host/uhci-platform.c