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	ARM: 6949/2: mach-u300: fix compilaton warning in IO accessors	14 years ago
Kconfig	tree-wide: fix comment/printk typos	14 years ago
Makefile	gpio: move U300 GPIO driver to drivers/gpio	14 years ago
Makefile.boot	…
clock.c	Fix common misspellings	14 years ago
clock.h	ARM: 6949/2: mach-u300: fix compilaton warning in IO accessors	14 years ago
core.c	treewide: Convert uses of struct resource to resource_size(ptr)	14 years ago
dummyspichip.c	spi/pl022: Add spi->mode support to AMBA SPI driver	15 years ago
i2c.c	ARM: AB3550 board configuration and irq for U300	15 years ago
i2c.h	ARM: 5668/2: U300 I2C board setup	16 years ago
mmc.c	mach-u300: config U300 PL180 PL011 PL022 for DMA	14 years ago
mmc.h	…
padmux.c	ARM: 5666/1: Revamped U300 padmux API	16 years ago
padmux.h	ARM: 5666/1: Revamped U300 padmux API	16 years ago
regulator.c	ARM: 5724/1: U300 AB3100 boardinfo v5	16 years ago
spi.c	mach-u300: set apropriate FIFO trigger levels	14 years ago
spi.h	ARM: 5667/3: U300 SSP/SPI board setup and test	16 years ago
timer.c	mach-u300: cleanup clockevent code	14 years ago
u300.c	ARM: P2V: separate PHYS_OFFSET from platform definitions	14 years ago