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		2011-07-26 17:41:04 -07:00
..
acs5k_defconfig
acs5k_tiny_defconfig
afeb9260_defconfig
ag5evm_defconfig
am200epdkit_defconfig
ap4evb_defconfig
assabet_defconfig
at91cap9adk_defconfig
at91rm9200_defconfig
at91sam9g20ek_defconfig
at91sam9rlek_defconfig
at91sam9260ek_defconfig
at91sam9261_defconfig	at91sam9261: rename at91sam9261ek to at91sam9261 defconfig	2011-05-25 23:04:33 +08:00
at91sam9263_defconfig	at91sam9263: merge all boards defconfig into only one	2011-05-25 23:04:32 +08:00
at91x40_defconfig
badge4_defconfig
bcmring_defconfig
cam60_defconfig
cerfcube_defconfig
cm_x2xx_defconfig
cm_x300_defconfig	ARM: pxa/cm-x300: update cm_x300_defconfig	2011-07-11 14:43:28 +08:00
cns3420vb_defconfig
colibri_pxa270_defconfig
colibri_pxa300_defconfig
collie_defconfig
corgi_defconfig
cpu9g20_defconfig
cpu9260_defconfig
da8xx_omapl_defconfig
davinci_all_defconfig	rtc: fix build warnings in defconfigs	2011-06-15 20:04:02 -07:00
dove_defconfig
ebsa110_defconfig
edb7211_defconfig
em_x270_defconfig
ep93xx_defconfig
eseries_pxa_defconfig
exynos4_defconfig
ezx_defconfig
footbridge_defconfig
fortunet_defconfig
g3evm_defconfig
g4evm_defconfig
h3600_defconfig
h5000_defconfig
h7201_defconfig
h7202_defconfig
hackkit_defconfig
imote2_defconfig
integrator_defconfig
iop13xx_defconfig
iop32x_defconfig
iop33x_defconfig
ixp4xx_defconfig
ixp23xx_defconfig
ixp2000_defconfig
jornada720_defconfig
kirkwood_defconfig
ks8695_defconfig
lart_defconfig
lpd270_defconfig
lubbock_defconfig
mackerel_defconfig
magician_defconfig
mainstone_defconfig
mini2440_defconfig
mmp2_defconfig	ARM: mmp2: update mmp2_defconfig to support mmc	2011-07-20 17:20:52 -04:00
msm_defconfig
mv78xx0_defconfig
mx1_defconfig
mx3_defconfig
mx21_defconfig
mx27_defconfig
mx51_defconfig	mx51: Let USB Storage be built by default	2011-07-07 08:45:00 +02:00
mxs_defconfig	ARM: mxs_defconfig: Add mx23evk and mx28evk build	2011-07-07 10:01:06 +02:00
neponset_defconfig
netwinder_defconfig
netx_defconfig	rtc: fix build warnings in defconfigs	2011-06-15 20:04:02 -07:00
nhk8815_defconfig
nuc910_defconfig
nuc950_defconfig
nuc960_defconfig
omap1_defconfig
omap2plus_defconfig
orion5x_defconfig
palmz72_defconfig
pcm027_defconfig
pcontrol_g20_defconfig
pleb_defconfig
pnx4008_defconfig
pxa3xx_defconfig
pxa168_defconfig
pxa255-idp_defconfig
pxa910_defconfig
qil-a9260_defconfig
raumfeld_defconfig
realview_defconfig
realview-smp_defconfig
rpc_defconfig
s3c2410_defconfig
s3c6400_defconfig
s5p64x0_defconfig
s5pc100_defconfig
s5pv210_defconfig
sam9_l9260_defconfig
shannon_defconfig
shark_defconfig
simpad_defconfig
spear3xx_defconfig
spear6xx_defconfig
spitz_defconfig
stamp9g20_defconfig
tct_hammer_defconfig
tegra_defconfig
trizeps4_defconfig
u300_defconfig
u8500_defconfig	mach-ux500: add configs for snowball board	2011-06-23 12:04:56 +02:00
usb-a9260_defconfig
versatile_defconfig
vexpress_defconfig
viper_defconfig	rtc: fix build warnings in defconfigs	2011-06-15 20:04:02 -07:00
xcep_defconfig	rtc: fix build warnings in defconfigs	2011-06-15 20:04:02 -07:00
zeus_defconfig	rtc: fix build warnings in defconfigs	2011-06-15 20:04:02 -07:00