2e0e943436
Conflicts: arch/arm/kernel/setup.c arch/arm/mach-shmobile/board-kota2.c |
||
---|---|---|
.. | ||
.gitignore | ||
Makefile | ||
atags_to_fdt.c | ||
big-endian.S | ||
decompress.c | ||
head-sa1100.S | ||
head-shark.S | ||
head-sharpsl.S | ||
head-shmobile.S | ||
head-vt8500.S | ||
head-xscale.S | ||
head.S | ||
libfdt_env.h | ||
ll_char_wr.S | ||
misc.c | ||
mmcif-sh7372.c | ||
ofw-shark.c | ||
piggy.gzip.S | ||
piggy.lzma.S | ||
piggy.lzo.S | ||
sdhi-sh7372.c | ||
sdhi-shmobile.c | ||
sdhi-shmobile.h | ||
string.c | ||
vmlinux.lds.in |