Linus Torvalds 994c0e9925 Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc ... * 'next/soc' of git://git.linaro.org/people/arnd/arm-soc: (21 commits) MAINTAINERS: add ARM/FREESCALE IMX6 entry arm/imx: merge i.MX3 and i.MX6 arm/imx6q: add suspend/resume support arm/imx6q: add device tree machine support arm/imx6q: add smp and cpu hotplug support arm/imx6q: add core drivers clock, gpc, mmdc and src arm/imx: add gic_handle_irq function arm/imx6q: add core definitions and low-level debug uart arm/imx6q: add device tree source ARM: highbank: add suspend support ARM: highbank: Add cpu hotplug support ARM: highbank: add SMP support MAINTAINERS: add Calxeda Highbank ARM platform ARM: add Highbank core platform support ARM: highbank: add devicetree source ARM: l2x0: add empty l2x0_of_init picoxcell: add a definition of VMALLOC_END picoxcell: remove custom ioremap implementation picoxcell: add the DTS for the PC7302 board picoxcell: add the DTS for pc3x2 and pc3x3 devices ... Fix up trivial conflicts in arch/arm/Kconfig, and some more header file conflicts in arch/arm/mach-omap2/board-generic.c (as per an ealier merge by Arnd).		2011-11-01 21:08:03 -07:00
..
3ds_debugboard.h	…
audmux.h	…
board-mx31ads.h	…
board-mx31lilly.h	…
board-mx31lite.h	…
board-mx31moboard.h	…
board-pcm038.h	…
clock.h	…
common.h	Merge branch 'imx/imx6q' into next/soc	2011-11-02 02:46:55 +01:00
debug-macro.S	Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:34:22 -07:00
devices-common.h	Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:16:43 -07:00
dma.h	dmaengine: imx-sdma: use platform_device_id to identify sdma version	2011-07-27 09:31:45 +08:00
entry-macro.S	arm/imx: add gic_handle_irq function	2011-10-31 14:26:22 +01:00
esdhc.h	mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5	2011-07-27 09:31:14 +08:00
eukrea-baseboards.h	…
gpio.h	Merge branch 'highbank/soc' into next/soc	2011-11-02 02:46:10 +01:00
hardware.h	arm/imx6q: add core definitions and low-level debug uart	2011-10-31 14:26:21 +01:00
i2c.h	i2c-imx: remove init/exit hooks from platform data	2011-09-14 22:14:41 +01:00
iim.h	…
imx-uart.h	…
imxfb.h	…
io.h	arm/imx: remove cpu_is_xxx() check from __imx_ioremap()	2011-10-04 10:55:12 +02:00
iomux-mx1.h	…
iomux-mx2x.h	…
iomux-mx3.h	mx31moboard: Add poweroff support	2011-09-20 14:53:00 +02:00
iomux-mx21.h	…
iomux-mx25.h	…
iomux-mx27.h	…
iomux-mx35.h	…
iomux-mx50.h	…
iomux-mx51.h	ARM: i.MX51: clean up iomux-mx51.h	2011-08-17 08:41:23 +02:00
iomux-mx53.h	ARM: i.MX53: clean up iomux-mx53.h	2011-08-17 08:43:32 +02:00
iomux-v1.h	…
iomux-v3.h	Merge branch 'next/fixes' into next/cleanup	2011-10-31 23:25:41 +01:00
ipu.h	…
iram.h	…
irqs.h	arm/imx6q: add core definitions and low-level debug uart	2011-10-31 14:26:21 +01:00
mmc.h	…
mx1.h	…
mx1_camera.h	…
mx2_cam.h	…
mx2x.h	…
mx3_camera.h	…
mx3fb.h	…
mx3x.h	ARM: mx35: use generic function for displaying silicon revision	2011-08-26 08:50:59 +02:00
mx6q.h	arm/imx6q: add core definitions and low-level debug uart	2011-10-31 14:26:21 +01:00
mx21-usbhost.h	…
mx21.h	…
mx25.h	Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-multi-irq-v2' into imx-features	2011-09-29 10:40:29 +02:00
mx27.h	arm/imx: remove mx27_setup_weimcs() from mx27.h	2011-10-17 21:41:03 +02:00
mx31.h	arm/imx: remove mx31_setup_weimcs() from mx31.h	2011-10-17 21:41:03 +02:00
mx35.h	ARM: imx: Add PATA resources for other i.MX processors	2011-08-24 10:11:40 +02:00
mx50.h	…
mx51.h	Merge branches 'cleanups/assorted' and 'cleanups/mm-tzic' into imx-cleanup	2011-09-20 10:09:08 +02:00
mx53.h	ARM: mx5/mm: consolidate TZIC map code	2011-09-20 09:55:06 +02:00
mxc.h	arm/imx: remove cpu_is_xxx() from arch_idle()	2011-10-04 10:55:06 +02:00
mxc_ehci.h	…
mxc_nand.h	…
sdma.h	dmaengine: imx-sdma: use platform_device_id to identify sdma version	2011-07-27 09:31:45 +08:00
spi.h	…
ssi.h	…
system.h	arm/imx: remove cpu_is_xxx() from arch_idle()	2011-10-04 10:55:06 +02:00
timex.h	…
ulpi.h	…
uncompress.h	…
usb.h	…
vmalloc.h	…