kernel-fxtec-pro1x/arch/arm/mach-u300/include/mach
David Woodhouse 67577927e8 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
	drivers/mtd/mtd_blkdevs.c

Merge Grant's device-tree bits so that we can apply the subsequent fixes.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2010-10-30 12:35:11 +01:00
..
clkdev.h
coh901318.h DMAENGINE: generic channel status v2 2010-03-26 16:50:49 -07:00
debug-macro.S arm: return both physical and virtual addresses from addruart 2010-10-20 00:27:33 -04:00
dma_channels.h ARM: 5852/1: Add COH 901 318 DMA driver platform config for U300 2010-01-27 22:00:15 +00:00
entry-macro.S [ARM] 5473/1: U300 core machine support 2009-04-28 22:44:15 +01:00
gpio.h ARM: 6377/1: supply _cansleep gpio function to U300 2010-09-17 10:16:49 +01:00
hardware.h
io.h
irqs.h ARM: AB3550 board configuration and irq for U300 2010-05-28 01:37:47 +02:00
memory.h ARM: 6225/1: make TCM allocation static and common for all archs 2010-07-27 10:42:38 +01:00
platform.h [ARM] 5473/1: U300 core machine support 2009-04-28 22:44:15 +01:00
syscon.h ARM: 5665/1: U300 syscon register updates 2009-08-15 15:36:28 +01:00
system.h [ARM] 5473/1: U300 core machine support 2009-04-28 22:44:15 +01:00
timex.h [ARM] 5473/1: U300 core machine support 2009-04-28 22:44:15 +01:00
u300-regs.h ARM: platform data to use the FSMC NAND with the U300 2010-10-25 00:35:46 +01:00
uncompress.h [ARM] 5473/1: U300 core machine support 2009-04-28 22:44:15 +01:00
vmalloc.h ARM: 5928/1: Change type of VMALLOC_END to unsigned long. 2010-02-15 21:40:33 +00:00