Russell King 938c0ace3f Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable ...

Conflicts:
	arch/arm/mach-pxa/tosa.c

2011-03-26 10:03:03 +00:00

..

arch.h

ARM: 6765/1: remove obsolete comment from asm/mach/arch.h

2011-02-26 13:33:47 +00:00

dma.h

[ARM] dma: move IOMD and floppy DMA structures to RiscPC DMA code

2009-02-21 21:36:22 +00:00

flash.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

irda.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

irq.h

ARM: 6806/1: irq: introduce entry and exit functions for chained handlers

2011-03-15 09:42:28 +00:00

map.h

ARM: 6222/1: add memory types for the TCMs

2010-07-18 20:29:47 +01:00

pci.h

[ARM] PCI: add platform private data to pci_sys_data

2010-07-16 22:01:59 -04:00

serial_at91.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

serial_sa1100.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

sharpsl_param.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

time.h

ARM: simplify early machine init hooks

2010-12-24 09:49:51 +00:00

udc_pxa2xx.h

ARM: pxa: drop gpio_vbus field from pxa2xx_udc_mach_info

2011-03-16 16:33:34 +08:00