leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16ee792e45
linux/arch/arm/mach-mxs
History
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
..
devices arm: mach-mxs: add device for rtc 2011-08-23 08:56:15 +02:00
include/mach Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:31:25 -07:00
clock-mx23.c mx23: register clocks for mmc 2011-05-19 13:11:35 +02:00
clock-mx28.c Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:31:25 -07:00
clock.c ARM i.MX23/28: remove secondary field from struct clk. It's unused 2011-01-24 09:01:48 +01:00
devices-mx23.h arm: mach-mxs: add device for rtc 2011-08-23 08:56:15 +02:00
devices-mx28.h arm: mach-mxs: add device for rtc 2011-08-23 08:56:15 +02:00
devices.c gpio/mxs: Change gpio-mxs into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
icoll.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
iomux.c ARM: mxs: Add iomux support 2010-12-20 17:29:58 +01:00
Kconfig Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/devel 2011-10-20 15:14:25 +02:00
mach-m28evk.c ARM: mxs: Add initial support for DENX MX28 2011-10-13 09:06:58 +02:00
mach-mx23evk.c Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:31:25 -07:00
mach-mx28evk.c Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:31:25 -07:00
mach-stmp378x_devb.c Merge branch 'imx/cleanup' into imx/devel 2011-10-07 21:57:31 +02:00
mach-tx28.c Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:31:25 -07:00
Makefile Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:25:36 -07:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mm.c ARM: mxs: Consolidate mm-mx23.c and mm-mx28.c into a single file 2011-10-04 10:08:06 +02:00
module-tx28.c ARM: mxs: configure and register the second FEC device on TX28/STK5-V4 2011-03-23 15:08:14 +01:00
module-tx28.h ARM: mxs: configure and register the second FEC device on TX28/STK5-V4 2011-03-23 15:08:14 +01:00
ocotp.c arm: mxs: include asm/processor.h for cpu_relax() 2011-06-06 09:50:04 +02:00
pm.c ARM: mxs: add initial pm support 2011-01-26 08:30:49 +01:00
regs-clkctrl-mx23.h ARM i.MX23: remove reserved register defines 2011-01-28 08:28:52 +01:00
regs-clkctrl-mx28.h ARM i.MX28: remove reserved register defines 2011-01-28 08:28:57 +01:00
system.c ARM: mxs: Add missing EXPORT_SYMBOL for mxs_reset_block 2011-03-07 19:29:06 +01:00
timer.c clocksource: convert MXS timrotv2 to 32-bit down counting clocksource 2011-05-23 18:04:52 +01:00