linux-stable-rt/arch/arm/plat-mxc/include/mach
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
entry-macro.S
esdhc.h
eukrea-baseboards.h
gpio.h Merge branch 'highbank/soc' into next/soc 2011-11-02 02:46:10 +01:00
hardware.h
i2c.h
iim.h
imx-uart.h
imxfb.h
io.h
iomux-mx1.h
iomux-mx2x.h
iomux-mx3.h
iomux-mx21.h
iomux-mx25.h
iomux-mx27.h
iomux-mx35.h
iomux-mx50.h
iomux-mx51.h
iomux-mx53.h
iomux-v1.h
iomux-v3.h
ipu.h
iram.h
irqs.h
mmc.h
mx1.h
mx1_camera.h
mx2_cam.h
mx2x.h
mx3_camera.h
mx3fb.h
mx3x.h
mx6q.h
mx21-usbhost.h
mx21.h
mx25.h
mx27.h
mx31.h
mx35.h
mx50.h
mx51.h
mx53.h
mxc.h
mxc_ehci.h
mxc_nand.h
sdma.h
spi.h
ssi.h
system.h
timex.h
ulpi.h
uncompress.h
usb.h
vmalloc.h