kernel_optimize_test/drivers/usb/otg
Linus Torvalds 0df0914d41 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (258 commits)
  omap: zoom: host should not pull up wl1271's irq line
  arm: plat-omap: iommu: fix request_mem_region() error path
  OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430
  omap4: mux: Remove duplicate mux modes
  omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag
  omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set
  omap2+: mux: Fix compile when CONFIG_OMAP_MUX is not selected
  omap4: board-omap4panda: Initialise the serial pads
  omap3: board-3430sdp: Initialise the serial pads
  omap4: board-4430sdp: Initialise the serial pads
  omap2+: mux: Add macro for configuring static with omap_hwmod_mux_init
  omap2+: mux: Remove the use of IDLE flag
  omap2+: Add separate list for dynamic pads to mux
  perf: add OMAP support for the new power events
  OMAP4: Add IVA OPP enteries.
  OMAP4: Update Voltage Rail Values for MPU, IVA and CORE
  OMAP4: Enable 800 MHz and 1 GHz MPU-OPP
  OMAP3+: OPP: Replace voltage values with Macros
  OMAP3: wdtimer: Fix CORE idle transition
  Watchdog: omap_wdt: add fine grain runtime-pm
  ...

Fix up various conflicts in
 - arch/arm/mach-omap2/board-omap3evm.c
 - arch/arm/mach-omap2/clock3xxx_data.c
 - arch/arm/mach-omap2/usb-musb.c
 - arch/arm/plat-omap/include/plat/usb.h
 - drivers/usb/musb/musb_core.h
2011-03-17 19:28:15 -07:00
..
ab8500-usb.c usb: otg: notifier: switch to atomic notifier 2011-02-18 14:05:54 +02:00
gpio_vbus.c
isp1301_omap.c wip: fix section mismatches in omap1_defconfig 2011-02-09 16:40:30 -08:00
Kconfig usb: otg: Add ulpi viewport access ops 2011-03-11 14:22:10 -08:00
langwell_otg.c USB OTG Langwell: use simple IPC command to control VBus power. 2011-03-09 15:40:04 -08:00
Makefile usb: otg: Add ulpi viewport access ops 2011-03-11 14:22:10 -08:00
msm_otg.c USB: Rename "msm72k_otg.c" to "msm_otg.c" 2011-03-07 12:15:21 -08:00
nop-usb-xceiv.c usb: otg: notifier: switch to atomic notifier 2011-02-18 14:05:54 +02:00
otg.c
twl4030-usb.c usb: otg: TWL4030: Update the last_event variable. 2011-03-01 11:35:27 +02:00
twl6030-usb.c usb: otg: notifier: switch to atomic notifier 2011-02-18 14:05:54 +02:00
ulpi_viewport.c usb: otg: Add ulpi viewport access ops 2011-03-11 14:22:10 -08:00
ulpi.c usb: otg: Make USB3319 ULPI ID generic 2011-01-22 18:32:53 -08:00