• Linus Torvalds's avatar
    Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc · 69f1d1a6
    Linus Torvalds authored
    * '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
    69f1d1a6
Name
Last commit
Last update
..
acs5k_defconfig Loading commit data...
acs5k_tiny_defconfig Loading commit data...
afeb9260_defconfig Loading commit data...
ag5evm_defconfig Loading commit data...
am200epdkit_defconfig Loading commit data...
ap4evb_defconfig Loading commit data...
assabet_defconfig Loading commit data...
at91cap9adk_defconfig Loading commit data...
at91rm9200_defconfig Loading commit data...
at91sam9260ek_defconfig Loading commit data...
at91sam9261_defconfig Loading commit data...
at91sam9263_defconfig Loading commit data...
at91sam9g20ek_defconfig Loading commit data...
at91sam9rlek_defconfig Loading commit data...
at91x40_defconfig Loading commit data...
badge4_defconfig Loading commit data...
bcmring_defconfig Loading commit data...
cam60_defconfig Loading commit data...
cerfcube_defconfig Loading commit data...
cm_x2xx_defconfig Loading commit data...
cm_x300_defconfig Loading commit data...
cns3420vb_defconfig Loading commit data...
colibri_pxa270_defconfig Loading commit data...
colibri_pxa300_defconfig Loading commit data...
collie_defconfig Loading commit data...
corgi_defconfig Loading commit data...
cpu9260_defconfig Loading commit data...
cpu9g20_defconfig Loading commit data...
da8xx_omapl_defconfig Loading commit data...
davinci_all_defconfig Loading commit data...
dove_defconfig Loading commit data...
ebsa110_defconfig Loading commit data...
edb7211_defconfig Loading commit data...
em_x270_defconfig Loading commit data...
ep93xx_defconfig Loading commit data...
eseries_pxa_defconfig Loading commit data...
exynos4_defconfig Loading commit data...
ezx_defconfig Loading commit data...
footbridge_defconfig Loading commit data...
fortunet_defconfig Loading commit data...
g3evm_defconfig Loading commit data...
g4evm_defconfig Loading commit data...
h3600_defconfig Loading commit data...
h5000_defconfig Loading commit data...
h7201_defconfig Loading commit data...
h7202_defconfig Loading commit data...
hackkit_defconfig Loading commit data...
imote2_defconfig Loading commit data...
integrator_defconfig Loading commit data...
iop13xx_defconfig Loading commit data...
iop32x_defconfig Loading commit data...
iop33x_defconfig Loading commit data...
ixp2000_defconfig Loading commit data...
ixp23xx_defconfig Loading commit data...
ixp4xx_defconfig Loading commit data...
jornada720_defconfig Loading commit data...
kirkwood_defconfig Loading commit data...
ks8695_defconfig Loading commit data...
lart_defconfig Loading commit data...
lpd270_defconfig Loading commit data...
lubbock_defconfig Loading commit data...
mackerel_defconfig Loading commit data...
magician_defconfig Loading commit data...
mainstone_defconfig Loading commit data...
mini2440_defconfig Loading commit data...
mmp2_defconfig Loading commit data...
msm_defconfig Loading commit data...
mv78xx0_defconfig Loading commit data...
mx1_defconfig Loading commit data...
mx21_defconfig Loading commit data...
mx27_defconfig Loading commit data...
mx3_defconfig Loading commit data...
mx51_defconfig Loading commit data...
mxs_defconfig Loading commit data...
neponset_defconfig Loading commit data...
netwinder_defconfig Loading commit data...
netx_defconfig Loading commit data...
nhk8815_defconfig Loading commit data...
nuc910_defconfig Loading commit data...
nuc950_defconfig Loading commit data...
nuc960_defconfig Loading commit data...
omap1_defconfig Loading commit data...
omap2plus_defconfig Loading commit data...
orion5x_defconfig Loading commit data...
palmz72_defconfig Loading commit data...
pcm027_defconfig Loading commit data...
pcontrol_g20_defconfig Loading commit data...
pleb_defconfig Loading commit data...
pnx4008_defconfig Loading commit data...
pxa168_defconfig Loading commit data...
pxa255-idp_defconfig Loading commit data...
pxa3xx_defconfig Loading commit data...
pxa910_defconfig Loading commit data...
qil-a9260_defconfig Loading commit data...
raumfeld_defconfig Loading commit data...
realview-smp_defconfig Loading commit data...
realview_defconfig Loading commit data...
rpc_defconfig Loading commit data...
s3c2410_defconfig Loading commit data...
s3c6400_defconfig Loading commit data...
s5p64x0_defconfig Loading commit data...
s5pc100_defconfig Loading commit data...
s5pv210_defconfig Loading commit data...
sam9_l9260_defconfig Loading commit data...
shannon_defconfig Loading commit data...
shark_defconfig Loading commit data...
simpad_defconfig Loading commit data...
spear3xx_defconfig Loading commit data...
spear6xx_defconfig Loading commit data...
spitz_defconfig Loading commit data...
stamp9g20_defconfig Loading commit data...
tct_hammer_defconfig Loading commit data...
tegra_defconfig Loading commit data...
trizeps4_defconfig Loading commit data...
u300_defconfig Loading commit data...
u8500_defconfig Loading commit data...
usb-a9260_defconfig Loading commit data...
versatile_defconfig Loading commit data...
vexpress_defconfig Loading commit data...
viper_defconfig Loading commit data...
xcep_defconfig Loading commit data...
zeus_defconfig Loading commit data...