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

[ARM] Remove '__address' from scatterlist and convert to DMA API

2006-01-04 15:08:30 +00:00

flash.h

[ARM] 3057/1: Add memory control method to support OneNAND sync burst read

2005-11-09 15:15:10 +00:00

irda.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

irq.h

[ARM] Remove compatibility layer for ARM irqs

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

map.h

[ARM] mm 10: allow memory type to be specified with ioremap

2007-05-05 20:59:27 +01:00

mmc.h

mmc: Move OCR bit defines

2007-05-01 13:04:16 +02:00

pci.h

iop: unconditionally initialize the ATU on platforms known to be 'hosts'

2008-03-26 12:33:41 -07:00

serial_at91.h

[PATCH] atmel_serial: Rename at91_register_uart_fns

2006-10-04 10:25:05 -07:00

serial_sa1100.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

sharpsl_param.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

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