Linus Torvalds 69f1d1a6ac Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc ...

* 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (128 commits)
  ARM: S5P64X0: External Interrupt Support
  ARM: EXYNOS4: Enable MFC on Samsung NURI
  ARM: EXYNOS4: Enable MFC on universal_c210
  ARM: S5PV210: Enable MFC on Goni
  ARM: S5P: Add support for MFC device
  ARM: EXYNOS4: Add support FIMD on SMDKC210
  ARM: EXYNOS4: Add platform device and helper functions for FIMD
  ARM: EXYNOS4: Add resource definition for FIMD
  ARM: EXYNOS4: Change devname for FIMD clkdev
  ARM: SAMSUNG: Add IRQ_I2S0 definition
  ARM: SAMSUNG: Add platform device for idma
  ARM: EXYNOS4: Add more registers to be saved and restored for PM
  ARM: EXYNOS4: Add more register addresses of CMU
  ARM: EXYNOS4: Add platform device for dwmci driver
  ARM: EXYNOS4: configure rtc-s3c on NURI
  ARM: EXYNOS4: configure MAX8903 secondary charger on NURI
  ARM: EXYNOS4: configure ADC on NURI
  ARM: EXYNOS4: configure MAX17042 fuel gauge on NURI
  ARM: EXYNOS4: configure regulators and PMIC(MAX8997) on NURI
  ARM: EXYNOS4: Increase NR_IRQS for devices with more IRQs
  ...

Fix up tons of silly conflicts:
 - arch/arm/mach-davinci/include/mach/psc.h
 - arch/arm/mach-exynos4/Kconfig
 - arch/arm/mach-exynos4/mach-smdkc210.c
 - arch/arm/mach-exynos4/pm.c
 - arch/arm/mach-imx/mm-imx1.c
 - arch/arm/mach-imx/mm-imx21.c
 - arch/arm/mach-imx/mm-imx25.c
 - arch/arm/mach-imx/mm-imx27.c
 - arch/arm/mach-imx/mm-imx31.c
 - arch/arm/mach-imx/mm-imx35.c
 - arch/arm/mach-mx5/mm.c
 - arch/arm/mach-s5pv210/mach-goni.c
 - arch/arm/mm/Kconfig

2011-07-26 17:41:04 -07:00

..

arm_timer.h

ARM: Improve documentation in arm_timer.h

2010-04-29 18:04:15 +01:00

cache-l2x0.h

ARM: 6741/1: errata: pl310 cache sync operation may be faulty

2011-02-19 11:23:21 +00:00

cache-tauros2.h

ARM: Add Tauros2 L2 cache controller support

2009-11-27 15:43:21 -05:00

clps7111.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

coresight.h

ARM: 6293/1: coresight: cosmetic fixes

2010-10-04 20:20:44 +01:00

cs89712.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

debug-8250.S

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

debug-pl01x.S

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

dec21285.h

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

entry-macro-gic.S

ARM: GIC: private a standard get_irqnr_preamble assembler macro

2010-12-14 19:21:47 +00:00

entry-macro-iomd.S

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

ep7211.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

ep7212.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

gic.h

ARM: GIC: move gic_chip_data structure declaration to header

2011-07-20 23:28:22 +09:00

icst.h

Update broken web addresses in arch directory.

2010-10-18 11:03:21 +02:00

ioc.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

iomd.h

[ARM] clps7500: remove support

2008-11-27 12:38:11 +00:00

iop3xx-adma.h

iop-adma: redundant/wrong tests in iop_*_count()?

2010-02-28 22:22:12 -07:00

iop3xx-gpio.h

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

iop3xx.h

iop: enable generic time

2009-10-29 11:46:55 -07:00

iop_adma.h

Merge branch 'dmaengine' into async-tx-next

2009-09-08 17:55:21 -07:00

it8152.h

ARM: it8152: add IT8152_LAST_IRQ definition to fix build error

2011-01-03 23:18:32 +08:00

linkup-l1110.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

locomo.h

[ARM] locomo: allow cascaded IRQ base to be specified by platforms

2010-03-02 07:40:50 +08:00

memc.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

pci_v3.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

pl080.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

pl330.h

ARM: 6132/1: PL330: Add common core driver

2010-05-15 15:03:50 +01:00

sa1111.h

[ARM] sa1111: allow cascaded IRQs to be used by platforms

2010-03-02 07:40:51 +08:00

scoop.h

ARM: scoop: drop pcmcia_init callback

2011-07-11 14:43:32 +08:00

sp810.h

ARM: 6722/1: SPEAr: sp810: switch to slow mode before reset

2011-02-21 19:29:24 +00:00

ssp.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

timer-sp.h

clockevents: ARM sp804: allow clockevent name to be specified

2011-05-23 18:04:53 +01:00

uengine.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

vic.h

[ARM] VIC: Add power management device

2009-05-07 11:04:57 +01:00