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
..
aemif.h	…
asp.h	…
cdce949.h	…
clock.h	…
common.h	…
cp_intc.h	…
cpufreq.h	…
cpuidle.h	…
cputype.h	Fix common misspellings	14 years ago
da8xx.h	davinci: da850: add support for SATA interface	14 years ago
debug-macro.S	davinci: fix DEBUG_LL code for p2v changes	14 years ago
dm355.h	…
dm365.h	…
dm644x.h	…
dm646x.h	davinci: dm6467/T EVM: fix setting up of reference clock rate	14 years ago
edma.h	…
entry-macro.S	ARM: entry: remove unused irq_prio_table macro	14 years ago
gpio.h	…
hardware.h	davinci: move DM64XX_VDD3P3V_PWDN to devices.c	14 years ago
i2c.h	…
io.h	…
irqs.h	…
keyscan.h	…
memory.h	ARM: mach-davinci: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size	14 years ago
mmc.h	…
mux.h	…
nand.h	…
pm.h	…
psc.h	Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
serial.h	davinci: fix DEBUG_LL code for p2v changes	14 years ago
spi.h	…
sram.h	…
system.h	…
time.h	…
timex.h	…
tnetv107x.h	…
uncompress.h	ARM: zImage: remove the static qualifier from global data variables	14 years ago
usb.h	…
vmalloc.h	…