android_kernel_samsung_msm8976/arch/arm/plat-omap
Linus Torvalds 5cc1035062 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (141 commits)
  USB: mct_u232: fix broken close
  USB: gadget: amd5536udc.c: fix error path
  USB: imx21-hcd - fix off by one resource size calculation
  usb: gadget: fix Kconfig warning
  usb: r8a66597-udc: Add processing when USB was removed.
  mxc_udc: add workaround for ENGcm09152 for i.MX35
  USB: ftdi_sio: add device ids for ScienceScope
  USB: musb: AM35x: Workaround for fifo read issue
  USB: musb: add musb support for AM35x
  USB: AM35x: Add musb support
  usb: Fix linker errors with CONFIG_PM=n
  USB: ohci-sh - use resource_size instead of defining its own resource_len macro
  USB: isp1362-hcd - use resource_size instead of defining its own resource_len macro
  USB: isp116x-hcd - use resource_size instead of defining its own resource_len macro
  USB: xhci: Fix compile error when CONFIG_PM=n
  USB: accept some invalid ep0-maxpacket values
  USB: xHCI: PCI power management implementation
  USB: xHCI: bus power management implementation
  USB: xHCI: port remote wakeup implementation
  USB: xHCI: port power management implementation
  ...

Manually fix up (non-data) conflict: the SCSI merge gad renamed the
'hw_sector_size' member to 'physical_block_size', and the USB tree
brought a new use of it.
2010-10-22 20:30:48 -07:00
..
include/plat Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2010-10-22 20:30:48 -07:00
clock.c OMAP4 clock: Support clk_set_parent 2010-05-20 12:31:12 -06:00
common.c omap3: introduce omap3_map_io 2010-08-04 14:43:18 +03:00
cpu-omap.c OMAP clock/CPUFreq: add clk_exit_cpufreq_table() 2010-01-08 15:23:16 -07:00
debug-devices.c omap: use smc91x_platdata to setup smc91x 2009-12-11 16:16:33 -08:00
debug-leds.c Replacing LEDS_OMAP_DEBUG with OMAP_DEBUG_LEDS 2010-07-05 17:03:58 +03:00
devices.c Removing dead OMAP_DSP 2010-07-05 16:31:54 +03:00
dma.c omap: dma: Support for prefetch in destination synchronizedtransfer 2010-08-02 14:21:40 +03:00
dmtimer.c omap: DMTIMER: Ack pending interrupt always when stopping a timer 2010-06-10 15:37:41 +03:00
fb.c memblock/arm: Fix memblock_region_is_memory() typo 2010-10-08 09:14:36 +02:00
gpio.c omap2: Fix GPIO numbers and smc91x for 2430sdp 2010-08-02 14:21:39 +03:00
i2c.c OMAP: PM constraints: add return values; add requesting device param to omap_pm_set_max_dev_wakeup_lat() 2010-07-26 16:34:34 -06:00
io.c Merge with mainline to remove plat-omap/Kconfig conflict 2010-03-01 14:19:05 -08:00
iommu-debug.c arm/omap: use generic_file_llseek in iommu_debug 2010-09-16 10:33:11 +02:00
iommu.c omap: iommu-load cam register before flushing the entry 2010-10-05 10:22:13 -07:00
iopgtable.h omap iommu: Rename iopte_[p,v]addr -> iopte_page_[p,v]addr 2010-06-29 07:55:05 +03:00
iovmm.c omap iommu: Fix Memory leak 2010-06-09 13:21:27 +03:00
Kconfig omap: Fix compile dependency to LEDS_CLASS 2010-09-15 10:18:51 -07:00
mailbox.c omap: mailbox: reorganize headers 2010-08-04 15:50:20 +03:00
Makefile OMAP4: hwmod: Enable omap_device build for OMAP4 2010-07-26 16:34:30 -06:00
mcbsp.c omap: McBSP: tx_irq_completion used in rx_irq_handler 2010-09-23 18:47:23 -07:00
mux.c omap: mux: Remove old mux code 2010-07-05 16:31:40 +03:00
ocpi.c
omap-pm-noop.c OMAP: PM constraints: add omap_pm_set_min_clk_rate() 2010-07-26 16:34:34 -06:00
omap_device.c omap: device: improve errors handling 2010-08-04 14:43:51 +03:00
sram.c ARM: 6408/1: omap: Map only available sram memory 2010-09-25 15:58:40 +01:00
usb.c omap: Move omap1 USB platform init code into mach-omap1/usb.c 2010-07-05 16:31:30 +03:00