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

aspenite.c

[ARM] pxa: add nand support in aspensite board

2009-12-01 09:02:44 +08:00

avengers_lite.c

[ARM] mmp: avengers lite (pxa168) board bring up

2010-03-02 07:40:53 +08:00

clock.c

ARM: Consolidate clks_register() and similar

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

clock.h

ARM: Consolidate clks_register() and similar

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

common.c

…

common.h

[ARM] mmp2: add handling on PMIC IRQ

2010-03-02 07:40:57 +08:00

devices.c

…

flint.c

[ARM] mmp: add support for Marvell MMP2

2010-03-02 07:40:55 +08:00

irq-mmp2.c

[ARM] mmp2: fix incorrect calling of chip->mask_ack() for 2nd level cascaded IRQs

2010-03-02 07:40:57 +08:00

irq-pxa168.c

[ARM] mmp: rename irq.c to irq-pxa168.c to allow other SoC IRQ chips

2010-03-02 07:40:54 +08:00

jasper.c

[ARM] mmp: support jasper development board

2010-03-02 07:40:55 +08:00

Kconfig

[ARM] mmp: support jasper development board

2010-03-02 07:40:55 +08:00

Makefile

[ARM] mmp: support jasper development board

2010-03-02 07:40:55 +08:00

Makefile.boot

…

mmp2.c

[ARM] mmp2: add handling on PMIC IRQ

2010-03-02 07:40:57 +08:00

pxa168.c

ARM: Consolidate clks_register() and similar

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

pxa910.c

ARM: Consolidate clks_register() and similar

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

tavorevb.c

[ARM] pxa: add base support for pxa910-based TavorEVB

2009-03-23 10:11:38 +08:00

time.c

[ARM] mmp: add support for Marvell MMP2

2010-03-02 07:40:55 +08:00

ttc_dkb.c

[ARM] pxa/ttc_dkb: remove duplicate macro definition

2009-12-29 14:11:33 +08:00