linux_dsm_epyc7002/arch/arm/mach-omap2
Linus Torvalds 3e5b08cbbf Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (144 commits)
  USB: add support for Dream Cheeky DL100B Webmail Notifier (1d34:0004)
  USB: serial: ftdi_sio: add support for TIOCSERGETLSR
  USB: ehci-mxc: Setup portsc register prior to accessing OTG viewport
  USB: atmel_usba_udc: fix freeing irq in usba_udc_remove()
  usb: ehci-omap: fix tll channel enable mask
  usb: ohci-omap3: fix trivial typo
  USB: gadget: ci13xxx: don't assume that PAGE_SIZE is 4096
  USB: gadget: ci13xxx: fix complete() callback for no_interrupt rq's
  USB: gadget: update ci13xxx to work with g_ether
  USB: gadgets: ci13xxx: fix probing of compiled-in gadget drivers
  Revert "USB: musb: pm: don't rely fully on clock support"
  Revert "USB: musb: blackfin: pm: make it work"
  USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path
  USB: uas: Ensure we only bind to a UAS interface
  USB: uas: Rename sense pipe and sense urb to status pipe and status urb
  USB: uas: Use kzalloc instead of kmalloc
  USB: uas: Fix up the Sense IU
  usb: musb: core: kill unneeded #include's
  DA8xx: assign name to MUSB IRQ resource
  usb: gadget: g_ncm added
  ...

Manually fix up trivial conflicts in USB Kconfig changes in:
	arch/arm/mach-omap2/Kconfig
	arch/sh/Kconfig
	drivers/usb/Kconfig
	drivers/usb/host/ehci-hcd.c
and annoying chip clock data conflicts in:
	arch/arm/mach-omap2/clock3xxx_data.c
	arch/arm/mach-omap2/clock44xx_data.c
2011-01-07 13:16:28 -08:00
..
include/mach Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2011-01-06 19:13:58 -08:00
board-2430sdp.c
board-3430sdp.c
board-3630sdp.c
board-4430sdp.c Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-01-07 13:16:28 -08:00
board-am3517crane.c
board-am3517evm.c
board-apollon.c
board-cm-t35.c
board-cm-t3517.c
board-devkit8000.c
board-flash.c
board-flash.h
board-generic.c
board-h4.c
board-igep0020.c
board-igep0030.c
board-ldp.c
board-n8x0.c Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-01-07 13:16:28 -08:00
board-omap3beagle.c
board-omap3evm.c
board-omap3logic.c
board-omap3pandora.c Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2011-01-06 19:13:58 -08:00
board-omap3stalker.c
board-omap3touchbook.c
board-omap4panda.c Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-01-07 13:16:28 -08:00
board-overo.c
board-rm680.c
board-rx51-peripherals.c
board-rx51-video.c
board-rx51.c
board-zoom-debugboard.c
board-zoom-peripherals.c
board-zoom.c
clkt2xxx_apll.c
clkt2xxx_dpllcore.c
clkt2xxx_osc.c
clkt2xxx_sys.c
clkt2xxx_virt_prcm_set.c
clkt34xx_dpll3m2.c
clkt_clksel.c
clkt_dpll.c
clock2xxx.c
clock2xxx.h
clock3xxx_data.c Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-01-07 13:16:28 -08:00
clock3xxx.c
clock3xxx.h
clock34xx.c
clock34xx.h
clock36xx.c
clock36xx.h
clock44xx_data.c Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-01-07 13:16:28 -08:00
clock44xx.h
clock2420_data.c Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-01-07 13:16:28 -08:00
clock2430_data.c Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-01-07 13:16:28 -08:00
clock2430.c
clock3517.c
clock3517.h
clock_common_data.c
clock.c
clock.h
clockdomain.c
clockdomain.h
clockdomains2xxx_3xxx_data.c
clockdomains44xx_data.c
cm1_44xx.h
cm2_44xx.h
cm2xxx_3xxx.c
cm2xxx_3xxx.h
cm44xx.c
cm44xx.h
cm-regbits-24xx.h
cm-regbits-34xx.h
cm-regbits-44xx.h
cm.h
cminst44xx.c
cminst44xx.h
common.c
control.c
control.h
cpuidle34xx.c
devices.c
dma.c
dpll3xxx.c Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2011-01-06 19:13:58 -08:00
dsp.c
emu.c
gpio.c
gpmc-nand.c
gpmc-onenand.c
gpmc-smc91x.c
gpmc-smsc911x.c
gpmc.c
hsmmc.c
hsmmc.h
i2c.c
id.c
io.c
io.h
iommu2.c
irq.c
Kconfig Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-01-07 13:16:28 -08:00
mailbox.c
Makefile Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-01-07 13:16:28 -08:00
Makefile.boot
mcbsp.c
mux34xx.c
mux34xx.h
mux44xx.c
mux44xx.h
mux2420.c
mux2420.h
mux2430.c
mux2430.h
mux.c
mux.h
omap4-common.c Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2011-01-06 19:13:58 -08:00
omap44xx-smc.S
omap_hwmod_3xxx_data.c
omap_hwmod_44xx_data.c
omap_hwmod_2420_data.c
omap_hwmod_2430_data.c
omap_hwmod_common_data.c
omap_hwmod_common_data.h
omap_hwmod.c
omap_opp_data.h
omap_phy_internal.c
omap_twl.c
omap-headsmp.S
omap-hotplug.c
omap-iommu.c
omap-smp.c Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
opp2xxx.h
opp3xxx_data.c
opp4xxx_data.c
opp2420_data.c
opp2430_data.c
opp.c
pm24xx.c
pm34xx.c
pm44xx.c
pm_bus.c
pm-debug.c
pm.c
pm.h
powerdomain2xxx_3xxx.c
powerdomain44xx.c
powerdomain-common.c
powerdomain.c
powerdomain.h
powerdomains2xxx_3xxx_data.c
powerdomains2xxx_3xxx_data.h
powerdomains2xxx_data.c
powerdomains3xxx_data.c
powerdomains44xx_data.c
prcm44xx.h
prcm_mpu44xx.c
prcm_mpu44xx.h
prcm-common.h
prcm.c
prm2xxx_3xxx.c
prm2xxx_3xxx.h
prm44xx.c
prm44xx.h
prm-regbits-24xx.h
prm-regbits-34xx.h
prm-regbits-44xx.h
prm.h
prminst44xx.c
prminst44xx.h
scrm44xx.h
sdram-hynix-h8mbx00u0mer-0em.h
sdram-micron-mt46h32m32lf-6.h
sdram-nokia.c
sdram-nokia.h
sdram-numonyx-m65kxxxxam.h
sdram-qimonda-hyb18m512160af-6.h
sdrc2xxx.c
sdrc.c
sdrc.h
serial.c
sleep24xx.S
sleep34xx.S
smartreflex-class3.c
smartreflex.c
sr_device.c
sram34xx.S
sram242x.S
sram243x.S
timer-gp.c Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2011-01-06 19:13:58 -08:00
timer-gp.h
timer-mpu.c
usb-ehci.c
usb-fs.c
usb-musb.c
usb-tusb6010.c Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-01-07 13:16:28 -08:00
voltage.c
wd_timer.c
wd_timer.h