linux-kernel-test/arch/arm/mach-mxs/include/mach
Linus Torvalds 16ee792e45 Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc
* 'next/devel' of git://git.linaro.org/people/arnd/arm-soc: (50 commits)
  ARM: tegra: update defconfig
  arm/tegra: Harmony: Configure PMC for low-level interrupts
  arm/tegra: device tree support for ventana board
  arm/tegra: add support for ventana pinmuxing
  arm/tegra: prepare Seaboard pinmux code for derived boards
  arm/tegra: pinmux: ioremap registers
  gpio/tegra: Convert to a platform device
  arm/tegra: Convert pinmux driver to a platform device
  arm/dt: Tegra: Add pinmux node to tegra20.dtsi
  arm/tegra: Prep boards for gpio/pinmux conversion to pdevs
  ARM: mx5: fix clock usage for suspend
  ARM i.MX entry-macro.S: remove now unused code
  ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER
  ARM i.MX tzic: add handle_irq function
  ARM i.MX avic: add handle_irq function
  ARM: mx25: Add the missing IIM base definition
  ARM i.MX avic: convert to use generic irq chip
  mx31moboard: Add poweroff support
  ARM: mach-qong: Add watchdog support
  ARM: davinci: AM18x: Add wl1271/wlan support
  ...

Fix up conflicts in:
	arch/arm/mach-at91/at91sam9g45.c
	arch/arm/mach-mx5/devices-imx53.h
	arch/arm/plat-mxc/include/mach/memory.h
2011-11-01 20:31:25 -07:00
..
clock.h ARM i.MX23/28: remove secondary field from struct clk. It's unused 2011-01-24 09:01:48 +01:00
common.h ARM: mxs: add ocotp read function 2011-01-21 11:36:49 +01:00
debug-macro.S ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
devices-common.h ARM: mxs: add saif device 2011-08-23 08:56:13 +02:00
dma.h ARM: mxs-dma: include <linux/dmaengine.h> 2011-07-15 10:45:28 +02:00
entry-macro.S ARM: mxs: Add interrupt support 2010-12-20 10:37:56 +01:00
gpio.h Merge branch 'depends/rmk/gpio' into next/devel 2011-10-31 23:46:42 +01:00
hardware.h
io.h
iomux-mx23.h ARM: mxs: fix typo "GPO" in iomux-mx23.h 2011-03-07 19:29:47 +01:00
iomux-mx28.h ARM: mxs: Add iomux support 2010-12-20 17:29:58 +01:00
iomux.h ARM: mxs: add helper macro for pad control 2011-03-07 19:29:45 +01:00
irqs.h
mmc.h mmc: mxs-mmc: add mmc host driver for i.MX23/28 2011-03-15 13:49:37 -04:00
mx23.h ARM: mxs/i.MX23: make i2c defines consistent and match the reference manual 2011-05-19 13:11:21 +02:00
mx28.h ARM: mxs: make ssp error irq definition consistent 2011-03-07 19:29:54 +01:00
mxs.h Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:25:36 -07:00
mxsfb.h video: Add i.MX23/28 framebuffer driver 2011-03-07 19:29:30 +01:00
system.h ARM: mxs: Add reset routines 2010-12-20 10:37:52 +01:00
timex.h
uncompress.h ARM: mxs: Add initial support for DENX MX28 2011-10-13 09:06:58 +02:00
vmalloc.h