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

..

clkdev.c

ARM: Consolidate clks_register() and similar

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

dmabounce.c

Merge branches 'at91', 'cache', 'cup', 'ep93xx', 'ixp4xx', 'nuc', 'pending-dma-streaming', 'u300' and 'umc' into devel

2010-02-25 22:06:43 +00:00

gic.c

[ARM] 5556/1: Fix the irq_desc.cpu references

2009-06-19 15:11:16 +01:00

icst307.c

[ARM] Off-by-one in arch/arm/common/icst*

2006-09-27 23:17:54 +01:00

icst525.c

[ARM] Off-by-one in arch/arm/common/icst*

2006-09-27 23:17:54 +01:00

it8152.c

[ARM] 5298/1: Drop desc_handle_irq()

2008-10-09 15:00:36 +01:00

Kconfig

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel

2009-06-14 11:00:16 +01:00

locomo.c

[ARM] locomo: allow cascaded IRQ base to be specified by platforms

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

Makefile

[ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific

2009-06-11 22:20:22 +08:00

sa1111.c

[ARM] sa1111: allow cascaded IRQs to be used by platforms

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

scoop.c

[ARM] pxa: enable check_scoop_reg() only if CONFIG_PM is set.

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

sharpsl_param.c

[ARM] 4733/1: export sharpsl_param

2008-10-03 10:18:35 +01:00

time-acorn.c

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

uengine.c

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

via82c505.c

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

vic.c

ARM: 5881/1: vic.c: reorganize code

2010-01-20 12:28:29 +00:00