Russell King 044e5f45e4 Merge branch 'pxa' into devel ...

Conflicts:

	arch/arm/configs/em_x270_defconfig
	arch/arm/configs/xm_x270_defconfig

2008-07-13 12:05:49 +01:00

..

dmabounce.c

[ARM] Export dma_sync_sg_for_device()

2008-06-22 15:41:30 +01:00

gic.c

[ARM] spelling fixes

2007-05-20 20:10:32 +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] 4873/1: Fix ITE 8152 interrupt demux

2008-03-28 15:07:46 +00:00

Kconfig

[ARM] 4251/1: Fix sharpsl_pm dependency

2007-03-08 13:34:02 +00:00

locomo.c

[ARM] 5026/1: locomo: add .settype for gpio and several small fixes

2008-05-17 22:53:54 +01:00

Makefile

[RTC] remove old ARM rtc library code

2008-05-22 14:56:41 +01:00

sa1111.c

Clocklib: Fix SA1111 clock name mess.

2008-07-10 10:28:49 +01:00

scoop.c

[ARM] 4962/1: Introduce standard gpio interface for Scoop2.

2008-04-10 15:31:38 +01:00

sharpsl_param.c

[ARM] spelling fixes

2007-05-20 20:10:32 +01:00

sharpsl_pm.c

[ARM] pxa: separate out power manager and clock registers

2008-06-02 19:33:27 +01:00

time-acorn.c

[ARM] xtime_seqlock: fix more ARM machines for xtime deadlocking

2008-02-04 13:14:07 +00:00

uengine.c

[ARM] uengine: fix memset size error

2007-11-26 19:43:40 +00:00

via82c505.c

[ARM] Remove needless linux/ptrace.h includes

2007-04-21 20:34:47 +01:00

vic.c

[ARM] Remove compatibility layer for ARM irqs

2006-11-30 12:24:47 +00:00