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
..
arch.h	[ARM] 4835/1: Fix stale comment in struct machine_desc description	2008-02-21 21:13:35 +00:00
dma.h
flash.h
irda.h
irq.h
map.h
mmc.h
pci.h	iop: unconditionally initialize the ATU on platforms known to be 'hosts'	2008-03-26 12:33:41 -07:00
serial_at91.h
serial_sa1100.h
sharpsl_param.h
time.h	[ARM] dyntick: Remove obsolete and unused ARM dyntick support	2008-05-12 17:39:14 +01:00
udc_pxa2xx.h	PXA UDC - allow use of inverted GPIO for pullup	2008-07-10 20:15:10 +01:00