android_kernel_xiaomi_sm8350/arch/arm/plat-mxc
Russell King 988addf82e Merge branch 'origin' into devel-stable
Conflicts:
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-mx2/devices.h
	sound/soc/pxa/pxa-ssp.c
2010-03-08 20:21:04 +00:00
..
include/mach Merge branch 'origin' into devel-stable 2010-03-08 20:21:04 +00:00
audmux-v1.c arm/imx/audmux-v1: use SoC-prefixed names 2010-02-24 10:06:59 +01:00
audmux-v2.c arm/imx/audmux-v2: use SoC-prefixed names 2010-02-24 10:07:00 +01:00
clock.c imx: WARN in clk_disable if the clock isn't enabled 2010-02-02 09:07:11 +01:00
cpu.c
devices.c
dma-mx1-mx2.c arm/imx/dma-v1: protect #ifdef'd blocks additionally by cpu_is_... 2010-02-24 10:07:07 +01:00
ehci.c i.MX35: Add USB control register access support 2010-02-04 17:29:30 +01:00
gpio.c arm/imx/gpio: remove a BUG_ON in hot path 2010-02-24 10:06:58 +01:00
iomux-v1.c arm/imx/iomux-v1: check for invalid modes in mxc_gpio_mode 2010-02-24 10:07:16 +01:00
iomux-v3.c mxc: iomux v3: remove resource handling 2009-11-24 08:39:43 +01:00
irq.c MXC: use variable for irq controller base in entry-macro.S 2009-08-14 12:40:39 +02:00
Kconfig Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/master 2010-02-25 14:01:49 +01:00
Makefile Merge branch 'origin' into devel-stable 2010-03-08 20:21:04 +00:00
pwm.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
ssi-fiq-ksym.c ASoC: Add a new imx-ssi sound driver 2010-01-17 11:09:46 +00:00
ssi-fiq.S ASoC: Add a new imx-ssi sound driver 2010-01-17 11:09:46 +00:00
system.c MXC: add basic MXC91231 support 2009-08-14 12:40:46 +02:00
time.c mxc: refactor timer code to use timer versions 2010-02-09 16:15:26 +02:00
tzic.c mxc: TrustZone interrupt controller (TZIC) for Freescale i.MX5 family 2010-02-09 16:15:26 +02:00
ulpi.c MXC: Add support for ULPI Viewports 2009-11-14 10:29:15 +01:00