Olof Johansson d5a2a1ba83 Merge tag 'v3.4-rc6' into next/cleanup ...

Linux 3.4-rc6

Resolve conflict where an u5500 file had a bugfix go in, but was
deleted in the branch staged for next merge window.

Signed-off-by: Olof Johansson <olof@lixom.net>

2012-05-09 02:31:01 -07:00

..

whci

Merge branch 'for-next/dwc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

2011-12-12 15:19:53 -08:00

alchemy-common.c

MIPS: Alchemy: Au1300 SoC support

2011-12-07 22:02:05 +00:00

ehci-atmel.c

USB: ehci-atmel: add needed of.h header file

2012-04-04 18:35:43 +02:00

ehci-au1xxx.c

usb: Remove ehci_reset call from ehci_run

2011-12-08 09:38:53 -08:00

ehci-cns3xxx.c

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

ehci-dbg.c

simple_open: automatically convert to simple_open()

2012-04-05 15:25:50 -07:00

ehci-fsl.c

USB: ehci-fsl: Fix kernel crash on mpc5121e

2012-04-18 14:13:52 -07:00

ehci-fsl.h

Revert "powerpc/usb: fix issue of CPU halt when missing USB PHY clock"

2012-03-02 16:08:54 -08:00

ehci-grlib.c

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

ehci-hcd.c

EHCI: always clear the STS_FLR status bit

2012-04-18 13:06:59 -07:00

ehci-hub.c

EHCI: keep track of ports being resumed and indicate in hub_status_data

2012-04-09 15:43:21 -07:00

ehci-ixp4xx.c

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

ehci-lpm.c

USB: Mark EHCI LPM functions as __maybe_unused

2011-02-17 10:47:55 -08:00

ehci-ls1x.c

USB: Add EHCI bus glue for Loongson1x SoCs (UPDATED)

2012-01-24 15:28:02 -08:00

ehci-mem.c

USB: EHCI: AMD periodic frame list table quirk

2010-11-16 13:36:40 -08:00

ehci-msm.c

usb: otg: Convert all users to pass struct usb_otg for OTG functions

2012-02-27 15:41:52 +02:00

ehci-mv.c

usb: otg: Convert all users to pass struct usb_otg for OTG functions

2012-02-27 15:41:52 +02:00

ehci-mxc.c

usb: otg: Convert all users to pass struct usb_otg for OTG functions

2012-02-27 15:41:52 +02:00

ehci-octeon.c

usb: Remove ehci_reset call from ehci_run

2011-12-08 09:38:53 -08:00

ehci-omap.c

ARM: OMAP3: USB: Fix the EHCI ULPI PHY reset issue

2012-04-16 18:47:00 +02:00

ehci-orion.c

ARM: Orion: Get address map from plat-orion instead of via platform_data

2011-12-13 18:46:55 -05:00

ehci-pci.c

USB: EHCI: fix crash during suspend on ASUS computers

2012-04-24 13:55:43 -07:00

ehci-platform.c

USB: EHCI: Add a generic platform device driver

2012-03-15 12:42:07 -07:00

ehci-pmcmsp.c

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

ehci-ppc-of.c

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

ehci-ps3.c

usb: PS3 EHCI HC reset work-around

2011-12-08 09:38:53 -08:00

ehci-q.c

usb: fix number of mapped SG DMA entries

2011-12-09 16:18:19 -08:00

ehci-s5p.c

USB: ehci-s5p: add DMA burst support

2012-03-08 13:05:47 -08:00

ehci-sched.c

EHCI : Fix a regression in the ISO scheduler

2011-11-29 09:59:29 +09:00

ehci-sh.c

USB: irq: Remove IRQF_DISABLED

2011-09-18 01:39:36 -07:00

ehci-spear.c

USB: ehci-spear: Add PM support

2012-02-24 13:40:04 -08:00

ehci-sysfs.c

USB: EHCI: Allow users to override 80% max periodic bandwidth

2011-07-08 14:51:33 -07:00

ehci-tegra.c

USB: ehci-tegra: remove redundant gpio_set_value

2012-05-01 14:11:51 -04:00

ehci-vt8500.c

usb: Remove ehci_reset call from ehci_run

2011-12-08 09:38:53 -08:00

ehci-w90x900.c

usb: Remove ehci_reset call from ehci_run

2011-12-08 09:38:53 -08:00

ehci-xilinx-of.c

USB: EHCI: Don't use NO_IRQ in xilinx ehci driver

2012-01-16 08:23:15 +01:00

ehci-xls.c

Merge 3.2-rc3 into usb-linus

2011-11-26 19:46:48 -08:00

ehci.h

EHCI: keep track of ports being resumed and indicate in hub_status_data

2012-04-09 15:43:21 -07:00

fhci-dbg.c

…

fhci-hcd.c

usb: convert drivers/usb/* to use module_platform_driver()

2011-11-28 06:48:32 +09:00

fhci-hub.c

…

fhci-mem.c

…

fhci-q.c

…

fhci-sched.c

QE/FHCI: fixed the CONTROL bug

2011-10-18 13:51:34 -07:00

fhci-tds.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

fhci.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

fsl-mph-dr-of.c

usb: Fix build error due to dma_mask is not at pdev_archdata at ARM

2012-02-24 13:37:44 -08:00

hwa-hc.c

Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

2012-01-09 12:09:47 -08:00

imx21-dbg.c

usb: Fix typo in imx21-dbg.c

2012-02-13 14:32:34 -08:00

imx21-hcd.c

Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

2012-01-09 12:09:47 -08:00

imx21-hcd.h

USB: imx21-hcd accept arbitary transfer buffer alignement.

2010-10-22 10:22:03 -07:00

isp116x-hcd.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

isp116x.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

isp1362-hcd.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

isp1362.h

USB: host: Remove dead CONFIG_ARCH_KARO

2010-08-10 14:35:40 -07:00

isp1760-hcd.c

usb/isp1760: Fix race condition memory leak

2011-11-26 20:02:47 -08:00

isp1760-hcd.h

usb/isp1760: Allow to optionally trigger low-level chip reset via GPIOLIB.

2011-10-19 13:29:06 -07:00

isp1760-if.c

Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

2012-01-09 12:09:47 -08:00

Kconfig

USB: use generic platform driver on ath79

2012-03-15 12:45:43 -07:00

Makefile

usb: host: xhci: add platform driver support

2012-03-13 10:30:59 -07:00

octeon2-common.c

usb: Configure octeon2 glue logic for proper uSOF cycle period.

2011-05-03 10:09:32 -07:00

ohci-at91.c

USB: ohci-at91: change annotations for probe/remove functions

2012-04-17 16:29:32 +02:00

ohci-au1xxx.c

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2012-01-14 13:05:21 -08:00

ohci-cns3xxx.c

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

ohci-da8xx.c

USB: irq: Remove IRQF_DISABLED

2011-09-18 01:39:36 -07:00

ohci-dbg.c

USB: OHCI: fix new compiler warnings

2012-01-24 12:24:06 -08:00

ohci-ep93xx.c

OHCI: remove uses of hcd->state

2011-11-18 10:51:00 -08:00

ohci-exynos.c

USB: ohci-exynos: replace hcd->state with ohci->rh_state

2012-02-24 13:40:04 -08:00

ohci-hcd.c

Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system

2012-03-28 15:58:21 -07:00

ohci-hub.c

OHCI: remove uses of hcd->state

2011-11-18 10:51:00 -08:00

ohci-jz4740.c

USB: ohci-jz4740: Fix spelling in MODULE_ALIAS

2010-11-11 07:14:07 -08:00

ohci-mem.c

…

ohci-nxp.c

USB: ohci-nxp: Remove i2c_write(), use smbus

2012-03-13 14:27:28 -07:00

ohci-octeon.c

USB: irq: Remove IRQF_DISABLED

2011-09-18 01:39:36 -07:00

ohci-omap3.c

ARM: OMAP: USBHOST: Replace usbhs core driver APIs by Runtime pm APIs

2011-12-16 04:29:57 -07:00

ohci-omap.c

ARM: OMAP1: OHCI: use platform_data fn ptr to enable OCPI bus

2012-04-13 06:34:27 -06:00

ohci-pci.c

usb: add support for STA2X11 host driver

2012-01-24 14:15:37 -08:00

ohci-platform.c

USB: OHCI: Add a generic platform device driver

2012-03-15 12:41:58 -07:00

ohci-pnx8550.c

USB: irq: Remove IRQF_DISABLED

2011-09-18 01:39:36 -07:00

ohci-ppc-of.c

USB: irq: Remove IRQF_DISABLED

2011-09-18 01:39:36 -07:00

ohci-ppc-soc.c

USB: irq: Remove IRQF_DISABLED

2011-09-18 01:39:36 -07:00

ohci-ps3.c

USB: irq: Remove IRQF_DISABLED

2011-09-18 01:39:36 -07:00

ohci-pxa27x.c

USB: ohci-pxa27x: add clk_prepare/clk_unprepare calls

2012-03-15 13:46:54 -07:00

ohci-q.c

OHCI: remove uses of hcd->state

2011-11-18 10:51:00 -08:00

ohci-s3c2410.c

USB: ohci-s3c2410: add PM support

2011-11-30 20:08:26 +09:00

ohci-sa1111.c

USB: sa1111: add hcd .reset method

2012-03-24 11:30:14 +00:00

ohci-sh.c

OHCI: remove uses of hcd->state

2011-11-18 10:51:00 -08:00

ohci-sm501.c

OHCI: remove uses of hcd->state

2011-11-18 10:51:00 -08:00

ohci-spear.c

OHCI: remove uses of hcd->state

2011-11-18 10:51:00 -08:00

ohci-ssb.c

USB: irq: Remove IRQF_DISABLED

2011-09-18 01:39:36 -07:00

ohci-tmio.c

OHCI: remove uses of hcd->state

2011-11-18 10:51:00 -08:00

ohci-xls.c

usb: OHCI/EHCI-XLS: Use resource_size v3

2011-11-15 10:21:56 -08:00

ohci.h

usb: otg: Rename otg_transceiver to usb_phy

2012-02-13 13:34:36 +02:00

oxu210hp-hcd.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

oxu210hp.h

…

pci-quirks.c

xHCI: Correct the #define XHCI_LEGACY_DISABLE_SMI

2012-04-11 08:31:06 -07:00

pci-quirks.h

Intel xhci: Support EHCI/xHCI port switching.

2011-05-27 12:07:36 -07:00

r8a66597-hcd.c

usb: r8a66597-hcd: Convert to module_platform_driver

2012-03-02 16:20:29 -08:00

r8a66597.h

usb: r8a66597-hcd: add function for external controller

2011-07-08 14:57:11 -07:00

sl811_cs.c

pcmcia: Convert pcmcia_device_id declarations to const

2011-05-06 07:46:22 +02:00

sl811-hcd.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

sl811.h

…

u132-hcd.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

uhci-debug.c

USB: UHCI: Add support for big endian descriptors

2011-05-19 16:43:20 -07:00

uhci-grlib.c

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

uhci-hcd.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

uhci-hcd.h

USB: UHCI: Add support for big endian descriptors

2011-05-19 16:43:20 -07:00

uhci-hub.c

UHCI: hub_status_data should indicate if ports are resuming

2012-04-09 15:43:21 -07:00

uhci-pci.c

USB: UHCI: Move PCI specific functions to uhci-pci.c

2011-05-06 18:24:00 -07:00

uhci-q.c

usb: fix number of mapped SG DMA entries

2011-12-09 16:18:19 -08:00

xhci-dbg.c

xHCI: correct to print the true HSEE of USBCMD

2012-04-10 15:21:52 -07:00

xhci-ext-caps.h

xHCI: Correct the #define XHCI_LEGACY_DISABLE_SMI

2012-04-11 08:31:06 -07:00

xhci-hub.c

USB/xHCI: Enable USB 3.0 hub remote wakeup.

2012-02-14 12:12:24 -08:00

xhci-mem.c

xhci: Don't write zeroed pointers to xHC registers.

2012-04-11 08:28:55 -07:00

xhci-pci.c

xHCI: add XHCI_RESET_ON_RESUME quirk for VIA xHCI host

2012-04-11 08:28:59 -07:00

xhci-plat.c

usb: host: xhci: add platform driver support

2012-03-13 10:30:59 -07:00

xhci-ring.c

xHCI: use gfp flags from caller instead of GFP_ATOMIC

2012-04-11 08:29:00 -07:00

xhci.c

xhci: Fix register save/restore order.

2012-04-11 08:28:57 -07:00

xhci.h

xhci: don't re-enable IE constantly

2012-04-11 08:28:37 -07:00