linux_dsm_epyc7002/arch/arm/mach-omap2/include/mach
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
..
am35xx.h AM35xx EMAC: define submodule offsets 2010-05-20 10:53:55 -07:00
board-rx51.h OMAP2plus: Fix static function warnings 2010-10-08 10:02:49 -07:00
board-zoom.h OMAP3: ZOOM2/3/3630SDP: Add display board file for OMAP3 2011-01-10 10:54:20 +02:00
clkdev.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
ctrl_module_core_44xx.h omap4: control: Add the register definition headers 2010-09-27 14:02:58 -06:00
ctrl_module_pad_core_44xx.h omap4: control: Add the register definition headers 2010-09-27 14:02:58 -06:00
ctrl_module_pad_wkup_44xx.h omap4: control: Add the register definition headers 2010-09-27 14:02:58 -06:00
ctrl_module_wkup_44xx.h omap4: control: Add the register definition headers 2010-09-27 14:02:58 -06:00
debug-macro.S Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2011-03-17 19:28:15 -07:00
entry-macro.S TI816X: Update common OMAP machine specific sources 2011-02-16 08:31:39 -08:00
gpio.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
hardware.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
id.h omap: Add new interface omap_get_die_id 2010-08-02 14:21:41 +03:00
io.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
irqs.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
memory.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
omap4-common.h ARM: omap4: Provide do_wfi() for Thumb-2 2011-03-09 16:38:35 -08:00
smp.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
system.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
timex.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
uncompress.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
vmalloc.h ARM: 6484/1: fix compile warning in mm/init.c 2010-11-21 22:05:56 +00:00