Conflicts: arch/arm/kernel/setup.c arch/arm/mach-shmobile/board-kota2.c
Attach a file by drag & drop or click to upload
