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

..

clock.c

ARM: Consolidate clks_register() and similar

2010-02-12 17:32:36 +00:00

crm_regs.h

patch-mxc-add-ARCH_MX1

2008-12-16 14:58:40 +01:00

devices.c

mx1: Codingstyle: Let the compiler count arrays

2009-08-07 12:10:55 +02:00

devices.h

patch-mx1-add-devices

2008-12-16 14:58:41 +01:00

generic.c

mxc: turn to soc specific init_irq functions

2009-08-07 12:10:54 +02:00

Kconfig

arm/imx: Kconfig beautification

2009-03-13 10:34:18 +01:00

ksym_mx1.c

V4L/DVB (11350): Add camera (CSI) driver for MX1

2009-04-06 21:43:58 -03:00

mach-mx1ads.c

arm/imx: let platform files include the SoC-specific iomux header

2010-02-24 10:07:15 +01:00

mach-scb9328.c

arm/imx: let platform files include the SoC-specific iomux header

2010-02-24 10:07:15 +01:00

Makefile

mx1: prefix SOC specific defines with MX1_ and deprecate old names

2010-01-30 13:34:01 +01:00

Makefile.boot

patch-mxc-add-ARCH_MX1

2008-12-16 14:58:40 +01:00

mx1_camera_fiq.S

V4L/DVB (11350): Add camera (CSI) driver for MX1

2009-04-06 21:43:58 -03:00