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

..

include/mach

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

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

board-mop500-pins.c

Merge branches 'cns3xxx/devel', 'davinci/devel', 'imx/devel', 'lpc32xx/devel', 'pxa/devel', 'tegra/devel' and 'stericsson/master' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/devel

2011-07-17 21:31:38 +02:00

board-mop500-regulators.c

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

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

board-mop500-regulators.h

mach-ux500: configure board for the TPS61052 regulator v2

2011-03-28 08:54:23 +02:00

board-mop500-sdi.c

mach-ux500: Add SDI support for snowball board

2011-06-23 12:04:56 +02:00

board-mop500-stuib.c

mach-ux500: basic HREFv60 support v2

2011-03-14 14:05:16 +01:00

board-mop500-u8500uib.c

staging: ste_rmi4: remove cross-dependent platform data

2011-07-05 20:29:16 -07:00

board-mop500-uib.c

mach-x500: fix SECTION warnings in uib

2011-06-22 13:26:49 +02:00

board-mop500.c

Merge branches 'cns3xxx/devel', 'davinci/devel', 'imx/devel', 'lpc32xx/devel', 'pxa/devel', 'tegra/devel' and 'stericsson/master' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/devel

2011-07-17 21:31:38 +02:00

board-mop500.h

mach-ux500: Add SDI support for snowball board

2011-06-23 12:04:56 +02:00

board-u5500-sdi.c

mach-ux500: config Ux500 PL011 PL022 PL180 for DMA

2011-03-14 14:05:14 +01:00

board-u5500.c

mach-ux500: add lm3530 ALS platform data for U5500

2011-07-25 20:57:15 -07:00

clock.c

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

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

clock.h

ux500: add debugfs support for powerdebug

2010-12-20 13:32:45 +01:00

cpu-db5500.c

mach-ux500: iomap PRCMU TCDM memory

2011-06-21 10:57:42 +02:00

cpu-db8500.c

gpio/nomadik: fix sleepmode for elder Nomadik

2011-06-09 15:03:38 -06:00

cpu.c

mfd: add DB5500 PRCMU driver

2011-05-24 22:19:37 +02:00

devices-common.c

plat-nomadik: support varying number of GPIOs per block

2011-03-14 14:05:14 +01:00

devices-common.h

ARM: 6830/1: mach-ux500: force PrimeCell revisions

2011-05-26 10:33:35 +01:00

devices-db5500.h

ARM: 6830/1: mach-ux500: force PrimeCell revisions

2011-05-26 10:33:35 +01:00

devices-db8500.c

mach-ux500: config Ux500 PL011 PL022 PL180 for DMA

2011-03-14 14:05:14 +01:00

devices-db8500.h

ARM: 6830/1: mach-ux500: force PrimeCell revisions

2011-05-26 10:33:35 +01:00

devices.c

ux500: rework device registration

2010-12-08 13:14:06 +01:00

dma-db5500.c

mach-ux500: add MUSB to db5500 devices

2011-03-14 14:05:12 +01:00

headsmp.S

ARM: 6539/1: ux500: remove unnecessary barrier from the secondary startup

2010-12-24 09:50:26 +00:00

hotplug.c

ARM: CPU hotplug: remove bug checks in platform_cpu_die()

2010-12-20 15:09:10 +00:00

id.c

ux500: dynamic SOC detection

2011-01-10 18:34:53 +01:00

Kconfig

mach-ux500: Kconfig for snowball board

2011-06-23 12:04:56 +02:00

localtimer.c

ARM: 6759/1: smp: Select local timers vs broadcast timer support runtime

2011-02-23 17:54:27 +00:00

Makefile

mfd: update DB8500 PRCMU driver

2011-05-24 22:18:57 +02:00

Makefile.boot

ARM: 5832/1: ARM: U8500 Makefile.boot

2009-11-28 10:22:52 +00:00

mbox-db5500.c

treewide: Fix iomap resource size miscalculations

2011-04-10 17:01:04 +02:00

modem-irq-db5500.c

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

pins-db5500.h

ARM: 6371/1: ux500: add DB5500 pins

2010-09-19 12:12:26 +01:00

pins-db8500.h

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2010-10-25 07:59:01 -07:00

platsmp.c

ARM: 6993/1: platsmp: Allow secondary cpu hotplug with maxcpus=1

2011-07-07 14:45:07 +01:00

ste-dma40-db5500.h

ARM: 6372/1: ux500: add DB5500 DMA event lines

2010-09-19 12:12:27 +01:00

ste-dma40-db8500.h

ARM: 6418/1: ux500: rename DB8500 DMA event line macros

2010-10-04 19:46:07 +01:00

usb.c

mach-ux500: fix USB build error

2011-06-27 19:45:40 +02:00