Russell King 7b70c4275f Merge branch 'devel-stable' into devel ... Conflicts: arch/arm/kernel/entry-armv.S arch/arm/kernel/setup.c arch/arm/mm/init.c		2010-07-31 14:20:16 +01:00
..
arch.h	Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl', 'spear' and 'versatile' into devel	2010-07-31 14:19:35 +01: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: 6197/2: preliminary support for sparse IRQ	2010-07-09 14:41:33 +01: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: convert arm to arch_gettimeoffset()	2010-03-24 08:08:58 +00:00
udc_pxa2xx.h	[ARM] pxa: fix incorrect gpio type in udc_pxa2xx.h	2010-06-13 23:55:12 +08:00