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
..
clk.h	ARM: tegra: clock: Add function to set SDMMC tap delay	14 years ago
debug-macro.S	ARM: tegra: Centralize macros to define debug uart base	14 years ago
dma.h	Fix common misspellings	14 years ago
entry-macro.S	ARM: GIC: private a standard get_irqnr_preamble assembler macro	14 years ago
gpio.h	ARM: tegra: add tegra_gpio_table and tegra_gpio_config	14 years ago
io.h	ARM: io: make iounmap() a simple macro	14 years ago
iomap.h	ARM: tegra: add devices.c entries for audio	14 years ago
irqs.h	ARM: tegra: irqs: Update irq list	14 years ago
kbc.h	Input: tegra-kbc - change wakeup logic to be all or nothing	14 years ago
memory.h	ARM: P2V: separate PHYS_OFFSET from platform definitions	14 years ago
pinmux-t2.h	ARM: tegra: pinmux: Add missing drive pingroups and fix suspend	14 years ago
pinmux.h	[ARM] tegra: pinmux: add safe values, move tegra2, add suspend	15 years ago
powergate.h	ARM: tegra: Add api to control internal powergating	14 years ago
sdhci.h	mmc: tegra: add pm_flags	14 years ago
suspend.h	ARM: tegra: Add prototypes for subsystem suspend functions	14 years ago
system.h	ARM: remove unnecessary mach/hardware.h includes	14 years ago
tegra_wm8903_pdata.h	ARM: Tegra: Add to tegra_wm8903_platform_data	14 years ago
timex.h	…
uncompress.h	ARM: tegra: Centralize macros to define debug uart base	14 years ago
usb_phy.h	ARM: tegra: Add support for Tegra USB PHYs	14 years ago
vmalloc.h	arm: tegra: VMALLOC_END should be unsigned long	15 years ago