You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		14 years ago
..
include/plat	Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
Kconfig	ARM: S5P: Add support for MFC device	14 years ago
Makefile	ARM: S5P: Add support for MFC device	14 years ago
clock.c	ARM: SAMSUNG: Move duplicate code for SPDIF ops	14 years ago
cpu.c	ARM: S5P6442: Removing ARCH_S5P6442	14 years ago
dev-csis0.c	ARM: S5P: Rename MIPI-CSIS driver header and update Copyright	14 years ago
dev-csis1.c	ARM: S5P: Rename MIPI-CSIS driver header and update Copyright	14 years ago
dev-ehci.c	ARM: EXYNOS4: Add usb host phy control	14 years ago
dev-fimc0.c	ARM: S5P: Decrease IO Registers memory region size on FIMC	15 years ago
dev-fimc1.c	ARM: S5P: Decrease IO Registers memory region size on FIMC	15 years ago
dev-fimc2.c	ARM: S5P: Decrease IO Registers memory region size on FIMC	15 years ago
dev-fimc3.c	ARM: S5P: Add platform definitions for FIMC3	14 years ago
dev-fimd0.c	ARM: EXYNOS4: Add platform device and helper functions for FIMD	14 years ago
dev-mfc.c	ARM: S5P: Add support for MFC device	14 years ago
dev-onenand.c	ARM: SAMSUNG: Remove unused onenand plat functions	14 years ago
dev-pmu.c	ARM: S5P: Add PMU device	15 years ago
dev-uart.c	ARM: S5P: Fix end address in memory resource information for UART devices	14 years ago
irq-eint.c	arm: Fold irq_set_chip/irq_set_handler	14 years ago
irq-gpioint.c	genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd)	14 years ago
irq-pm.c	ARM / Samsung: Use struct syscore_ops for "core" power management	14 years ago
irq.c	ARM: SAMSUNG: Convert irq-vic-timer to generic irq chip	14 years ago
pm.c	ARM: S5P: Remove unused s3c_pm_check_resume_pin	14 years ago
s5p-time.c	Merge branch 'next-samsung-clkdev-fix' into next-samsung-devel	14 years ago
setup-mipiphy.c	ARM: S5P: Add support for common MIPI CSIS/DSIM D-PHY control	14 years ago
sysmmu.c	treewide: Convert uses of struct resource to resource_size(ptr)	14 years ago