linux-stable/arch/arm/plat-omap
Olof Johansson b612a85792 Merge branch 'next/soc' into next/multiplatform
* next/soc: (50 commits)
  ARM: OMAP: AM33xx hwmod: fixup SPI after platform_data move
  MAINTAINERS: add an entry for the BCM2835 ARM sub-architecture
  ARM: bcm2835: instantiate console UART
  ARM: bcm2835: add stub clock driver
  ARM: bcm2835: add system timer
  ARM: bcm2835: add interrupt controller driver
  ARM: add infra-structure for BCM2835 and Raspberry Pi
  ARM: tegra20: add CPU hotplug support
  ARM: tegra30: add CPU hotplug support
  ARM: tegra: clean up the common assembly macros into sleep.h
  ARM: tegra: replace the CPU CAR access code by tegra_cpu_car_ops
  ARM: tegra: introduce tegra_cpu_car_ops structures
  ARM: Tegra: Add smp_twd clock for Tegra20
  ARM: AM33XX: clock: Add dcan clock aliases for device-tree
  ARM: OMAP2+: dpll: Add missing soc_is_am33xx() check for common functions
  ARM: OMAP: omap_device: idle devices with no driver bound
  ARM: OMAP: omap_device: don't attempt late suspend if no driver bound
  ARM: OMAP: omap_device: keep track of driver bound status
  ARM: OMAP3+: hwmod: Add AM33XX HWMOD data
  ARM: OMAP2+: hwmod: Hook-up am33xx support in omap_hwmod framework
  ...

Change/remove conflict in arch/arm/mach-ux500/clock.c resolved.

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-09-20 21:27:41 -07:00
..
include/plat Merge branch 'next/soc' into next/multiplatform 2012-09-20 21:27:41 -07:00
clock.c ARM: OMAP: PM: Lock clocks list while generating summary 2012-06-17 11:57:50 -06:00
common.c ARM: omap: move platform_data definitions 2012-09-19 17:39:52 +02:00
counter_32k.c ARM: OMAP: Split plat/hardware.h, use local soc.h for omap2+ 2012-09-12 18:06:31 -07:00
debug-devices.c ARM: OMAP: remove plat/board.h file 2012-09-10 16:39:21 -07:00
debug-leds.c ARM: OMAP: Move gpio.h to include/linux/platform_data 2012-09-12 18:06:30 -07:00
dma.c smatch and string-wrapping cleanups for the OMAP subarch code. 2012-09-12 20:42:36 -07:00
dmtimer.c ARM: OMAP: dmtimers: Fix locking issue in omap_dm_timer_request*() 2012-08-13 06:23:16 -07:00
fb.c ARM: OMAP1: move lcd pdata out of arch/arm/* 2012-09-10 16:34:00 -07:00
i2c.c ARM: OMAP1: Make plat/mux.h omap1 only 2012-09-20 14:54:57 -07:00
Kconfig ARM: OMAP2+: Remove hardcoded IRQs and enable SPARSE_IRQ 2012-09-12 18:06:30 -07:00
mailbox.c ARM: OMAP: enable mailbox irq per instance 2012-05-13 16:09:39 +03:00
Makefile ARM: OMAP1: Make plat/mux.h omap1 only 2012-09-20 14:54:57 -07:00
omap-pm-noop.c ARM: OMAP: unwrap strings 2012-09-12 02:57:10 -06:00
omap_device.c Merge branch 'next/soc' into next/multiplatform 2012-09-20 21:27:41 -07:00
sram.c ARM: tegra: switch to dmaengine 2012-09-20 19:57:38 -07:00
sram.h