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/mach	Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
Kconfig	ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen	15 years ago
Makefile	ARM: S3C2410: remove the now empty mach-s3c2410/irq.c	14 years ago
Makefile.boot	ARM: S3C24XX: Locate kernel at 0x30108000 if PM_H1940 is enabled	15 years ago
bast-ide.c	…
bast-irq.c	arm: Fold irq_set_chip/irq_set_handler	14 years ago
cpu-freq.c	…
dma.c	ARM: SAMSUNG: Remove dma-plat.h to allow plat-s3c64xx to be removed	15 years ago
gpio.c	…
h1940-bluetooth.c	treewide: remove duplicate includes	14 years ago
mach-amlm5900.c	mtd: s3c2410: remove CONFIG_MTD_PARTITIONS test	14 years ago
mach-bast.c	ARM / Samsung: Use struct syscore_ops for "core" power management	14 years ago
mach-h1940.c	ARM: H1940/RX1950: Change default LED triggers	14 years ago
mach-n30.c	Fix common misspellings	14 years ago
mach-otom.c	arm: remove machine_desc.io_pg_offst and .phys_io	15 years ago
mach-qt2410.c	mach-qt2410: convert to spi_gpio	14 years ago
mach-smdk2410.c	arm: remove machine_desc.io_pg_offst and .phys_io	15 years ago
mach-tct_hammer.c	mtd: s3c2410: remove CONFIG_MTD_PARTITIONS test	14 years ago
mach-vr1000.c	arm: remove machine_desc.io_pg_offst and .phys_io	15 years ago
nor-simtec.c	ARM: 6910/1: MTD: physmap: let set_vpp() pass a platform_device instead of a map_info	14 years ago
nor-simtec.h	…
pll.c	…
pm-h1940.S	…
pm.c	ARM / Samsung: Use struct syscore_ops for "core" power management	14 years ago
s3c2410.c	ARM / Samsung: Use struct syscore_ops for "core" power management	14 years ago
sleep.S	…
usb-simtec.c	…
usb-simtec.h	…