2e0e943436
Conflicts: arch/arm/kernel/setup.c arch/arm/mach-shmobile/board-kota2.c |
||
---|---|---|
.. | ||
mach |
2e0e943436
Conflicts: arch/arm/kernel/setup.c arch/arm/mach-shmobile/board-kota2.c |
||
---|---|---|
.. | ||
mach |