android_kernel_xiaomi_sm8350/arch/arm/include/asm/mach
Russell King 22b61a11fd Merge branch 'dma' into devel
Conflicts:

	arch/arm/plat-mxc/dma-mx1-mx2.c
2009-02-21 21:42:50 +00:00
..
arch.h
dma.h [ARM] dma: move IOMD and floppy DMA structures to RiscPC DMA code 2009-02-21 21:36:22 +00:00
flash.h
irda.h
irq.h
map.h [ARM] iop: iop3xx needs registers mapped uncached+unbuffered 2008-11-09 11:18:36 +00:00
mmc.h
pci.h PCI: arm: use generic INTx swizzle from PCI core 2009-01-07 11:13:13 -08:00
serial_at91.h
serial_sa1100.h
sharpsl_param.h
time.h
udc_pxa2xx.h [ARM] pxa: remove references to pxa_gpio_mode() in comments 2008-09-25 13:35:27 +01:00