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
..
addr-map.h	ARM: pxa: introduce addr-map.h for large bus addresses and ranges	2010-12-16 14:31:15 +08:00
arcom-pcmcia.h
audio.h
balloon3.h	ARM: pxa: Add Balloon3 NAND ready check	2010-12-20 23:14:09 +08:00
bitfield.h
camera.h
colibri.h	ARM: pxa/colibri: use correct SD detect pin	2011-02-09 23:05:03 +08:00
corgi.h	treewide: transciever/transceiver spelling fixes	2011-06-24 11:20:14 +02:00
csb726.h
debug-macro.S	arm: return both physical and virtual addresses from addruart	2010-10-20 00:27:33 -04:00
dma.h
entry-macro.S
eseries-gpio.h
eseries-irq.h	ARM: pxa: encode IRQ number into .nr_irqs	2010-10-08 16:21:17 +08:00
gpio.h	ARM: pxa: convert incorrect IRQ_TO_IRQ() to irq_to_gpio()	2011-04-13 09:30:40 +08:00
gumstix.h	[ARM] pxa: removing dead ARCH_GUMSTIX_ORIG	2010-08-05 14:32:31 +08:00
h5000.h
hardware.h	ARM: convert PCI defines to variables	2011-07-12 11:19:29 -05:00
hx4700.h	ARM: pxa: encode IRQ number into .nr_irqs	2010-10-08 16:21:17 +08:00
idp.h
io.h	arm: fix "arm: fix pci_set_consistent_dma_mask for dmabounce devices"	2010-09-22 17:22:38 -07:00
irda.h
irqs.h	ARM: pxa: move declarations from generic.h to <soc>.h	2011-07-12 19:50:32 +08:00
littleton.h	ARM: pxa: encode IRQ number into .nr_irqs	2010-10-08 16:21:17 +08:00
lpd270.h	ARM: pxa: encode IRQ number into .nr_irqs	2010-10-08 16:21:17 +08:00
lubbock.h	ARM: pxa: encode IRQ number into .nr_irqs	2010-10-08 16:21:17 +08:00
magician.h	ARM: pxa/magician: fix MAGICIAN_EGPIO_BASE, align with NR_BUILTIN_GPIO	2011-07-11 14:43:29 +08:00
mainstone.h	ARM: pxa: encode IRQ number into .nr_irqs	2010-10-08 16:21:17 +08:00
memory.h	ARM: mach-pxa: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size	2011-07-18 15:30:01 -04:00
mfp-pxa2xx.h
mfp-pxa3xx.h
mfp-pxa25x.h
mfp-pxa27x.h
mfp-pxa300.h	ARM: pxa: fix CI_HSYNC and CI_VSYNC MFP defines for pxa300	2010-08-30 09:59:43 +08:00
mfp-pxa320.h
mfp-pxa930.h	ARM: pxa: append tavorevb3 support	2010-10-09 17:07:24 +08:00
mfp.h
mioa701.h
mmc.h
mtd-xip.h
mxm8x10.h
ohci.h
palm27x.h	[ARM] pxa/palm: Introduce Palm27x	2010-08-05 14:32:39 +08:00
palmasoc.h
palmld.h
palmt5.h
palmtc.h
palmte2.h
palmtreo.h
palmtx.h
palmz72.h	ARM: pxa: PalmZ72: Add OV9640 camera support	2011-03-16 16:32:47 +08:00
pata_pxa.h	[ARM] pata_pxa: DMA-capable PATA driver	2010-06-18 15:07:32 +08:00
pcm027.h	ARM: pxa: encode IRQ number into .nr_irqs	2010-10-08 16:21:17 +08:00
pcm990_baseboard.h
pm.h	ARM: pm: allow suspend finisher to return error codes	2011-07-02 09:54:01 +01:00
poodle.h	ARM: pxa: encode IRQ number into .nr_irqs	2010-10-08 16:21:17 +08:00
pxa2xx-regs.h	ARM: pxa: Access SMEMC via virtual addresses	2010-12-16 14:31:16 +08:00
pxa3xx-regs.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
pxa3xx-u2d.h	ARM: pxa: add U2D controller and ULPI driver for pxa3xx	2010-10-08 16:21:17 +08:00
pxa3xx.h	ARM: pxa: enable MULTI_IRQ_HANDLER for all boards	2011-07-12 19:50:33 +08:00
pxa25x-udc.h
pxa25x.h	ARM: pxa: enable MULTI_IRQ_HANDLER for all boards	2011-07-12 19:50:33 +08:00
pxa27x-udc.h	treewide: transciever/transceiver spelling fixes	2011-06-24 11:20:14 +02:00
pxa27x.h	ARM: pxa: enable MULTI_IRQ_HANDLER for all boards	2011-07-12 19:50:33 +08:00
pxa300.h	ARM: pxa: add common header file for pxa3xx	2011-07-12 19:45:20 +08:00
pxa320.h	ARM: pxa: add common header file for pxa3xx	2011-07-12 19:45:20 +08:00
pxa930_rotary.h
pxa930_trkball.h
pxa930.h	ARM: pxa: add common header file for pxa3xx	2011-07-12 19:45:20 +08:00
pxafb.h	ARM: pxa: clean up set_pxa_fb_info	2011-03-16 16:32:47 +08:00
regs-ac97.h
regs-lcd.h
regs-ost.h
regs-rtc.h
regs-u2d.h
regs-uart.h
reset.h
sharpsl_pm.h	[ARM] pxa: removed mostly unused and confusing two sharpsl.h	2010-08-05 14:32:38 +08:00
smemc.h	ARM: pxa: Access SMEMC via virtual addresses	2010-12-16 14:31:16 +08:00
spitz.h	[ARM] pxa/spitz: Rework spitz	2010-08-05 14:32:41 +08:00
system.h
timex.h
tosa_bt.h
tosa.h	ARM: pxa: encode IRQ number into .nr_irqs	2010-10-08 16:21:17 +08:00
trizeps4.h
udc.h
uncompress.h	ARM: zImage: remove the static qualifier from global data variables	2011-05-07 00:08:02 -04:00
viper.h
vmalloc.h
vpac270.h
z2.h	ARM: PXA: Z2: Fix libertas init/tear down sequences	2011-03-16 14:56:02 +01:00
zeus.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
zylonite.h	ARM: pxa: encode IRQ number into .nr_irqs	2010-10-08 16:21:17 +08:00