Conflicts: arch/arm/kernel/module.c arch/arm/mach-s5pv210/sleep.S |
||
|---|---|---|
| .. | ||
| include/mach | ||
| Kconfig | ||
| Makefile | ||
| Makefile.boot | ||
| clock.c | ||
| cpu.c | ||
| dev-audio.c | ||
| dev-spi.c | ||
| dma.c | ||
| init.c | ||
| mach-smdk6442.c | ||
| setup-i2c0.c | ||
Conflicts: arch/arm/kernel/module.c arch/arm/mach-s5pv210/sleep.S |
||
|---|---|---|
| .. | ||
| include/mach | ||
| Kconfig | ||
| Makefile | ||
| Makefile.boot | ||
| clock.c | ||
| cpu.c | ||
| dev-audio.c | ||
| dev-spi.c | ||
| dma.c | ||
| init.c | ||
| mach-smdk6442.c | ||
| setup-i2c0.c | ||