988addf82e
Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c |
||
---|---|---|
.. | ||
addr-map.h | ||
clkdev.h | ||
cputype.h | ||
debug-macro.S | ||
devices.h | ||
dma.h | ||
entry-macro.S | ||
gpio.h | ||
hardware.h | ||
io.h | ||
irqs.h | ||
memory.h | ||
mfp-mmp2.h | ||
mfp-pxa168.h | ||
mfp-pxa910.h | ||
mfp.h | ||
mmp2.h | ||
pxa168.h | ||
pxa910.h | ||
regs-apbc.h | ||
regs-apmu.h | ||
regs-icu.h | ||
regs-timers.h | ||
system.h | ||
timex.h | ||
uncompress.h | ||
vmalloc.h |