OSDN Git Service

fix confrict
authorYoshinori Sato <ysato@users.sourceforge.jp>
Sun, 14 Dec 2014 08:48:37 +0000 (17:48 +0900)
committerYoshinori Sato <ysato@users.sourceforge.jp>
Sun, 14 Dec 2014 08:48:37 +0000 (17:48 +0900)
commite798818ed53941c192a94b3f7208e039e3a6ea7f
tree8e642e4203c5f537f27c7c560dbd211d0602bedd
parentb2a6ab09e40db008ee9b49aa625e114d32cbf6de
fix confrict
arch/h8300/Kconfig
arch/h8300/Makefile
arch/h8300/kernel/vmlinux.lds.S