206a1a825d
Merge branch 'for-2635-4/onenand' into for-2635-4/partial2 Conflicts: arch/arm/mach-s5pc100/cpu.c arch/arm/mach-s5pc100/include/mach/map.h arch/arm/mach-s5pv210/Makefile |
||
---|---|---|
.. | ||
debug-macro.S | ||
dma.h | ||
entry-macro.S | ||
gpio-bank-a.h | ||
gpio-bank-b.h | ||
gpio-bank-c.h | ||
gpio-bank-d.h | ||
gpio-bank-e.h | ||
gpio-bank-f.h | ||
gpio-bank-g.h | ||
gpio-bank-h.h | ||
gpio-bank-i.h | ||
gpio-bank-j.h | ||
gpio-bank-n.h | ||
gpio-bank-o.h | ||
gpio-bank-p.h | ||
gpio-bank-q.h | ||
gpio.h | ||
hardware.h | ||
io.h | ||
irqs.h | ||
map.h | ||
memory.h | ||
pll.h | ||
pm-core.h | ||
pwm-clock.h | ||
regs-clock.h | ||
regs-fb.h | ||
regs-gpio-memport.h | ||
regs-gpio.h | ||
regs-irq.h | ||
regs-modem.h | ||
regs-srom.h | ||
regs-sys.h | ||
regs-syscon-power.h | ||
s3c6400.h | ||
s3c6410.h | ||
spi-clocks.h | ||
system.h | ||
tick.h | ||
timex.h | ||
uncompress.h | ||
vmalloc.h |