OSDN Git Service

Merge branch 'master' into h8300
authorYoshinori Sato <ysato@users.sourceforge.jp>
Mon, 25 Jul 2011 01:49:09 +0000 (10:49 +0900)
committerYoshinori Sato <ysato@users.sourceforge.jp>
Mon, 25 Jul 2011 01:49:09 +0000 (10:49 +0900)
commit39f3ddd83e4861f72f84c5150f4f85272272789c
treebf3c1bdfd2044a14d431345ca75bf537475fd67f
parentacb124e6611b25ea4add20f4475e10c68073aa76
parent61ed4e4fec1d39b29a165a862a6d641a5789cc07
Merge branch 'master' into h8300

Conflicts:
arch/h8300/include/asm/types.h
arch/h8300/include/asm/unistd.h
arch/h8300/kernel/syscalls.S
arch/h8300/include/asm/types.h
arch/h8300/include/asm/unistd.h
arch/h8300/kernel/syscalls.S
arch/h8300/kernel/time.c
arch/h8300/kernel/timer/timer8.c