mirror of https://gitee.com/openkylin/linux.git
69f1d1a6ac
* '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 |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| platform-fec.c | ||
| platform-flexcan.c | ||
| platform-fsl-usb2-udc.c | ||
| platform-gpio-mxc.c | ||
| platform-gpio_keys.c | ||
| platform-imx-dma.c | ||
| platform-imx-fb.c | ||
| platform-imx-i2c.c | ||
| platform-imx-keypad.c | ||
| platform-imx-ssi.c | ||
| platform-imx-uart.c | ||
| platform-imx2-wdt.c | ||
| platform-imx21-hcd.c | ||
| platform-imx_udc.c | ||
| platform-imxdi_rtc.c | ||
| platform-ipu-core.c | ||
| platform-mx1-camera.c | ||
| platform-mx2-camera.c | ||
| platform-mxc-ehci.c | ||
| platform-mxc-mmc.c | ||
| platform-mxc_nand.c | ||
| platform-mxc_pwm.c | ||
| platform-mxc_rnga.c | ||
| platform-mxc_rtc.c | ||
| platform-mxc_w1.c | ||
| platform-sdhci-esdhc-imx.c | ||
| platform-spi_imx.c | ||