OSDN Git Service

Merge branch 'master' into h8300
authorYoshinori Sato <ysato@users.sourceforge.jp>
Thu, 3 Mar 2011 08:40:46 +0000 (17:40 +0900)
committerYoshinori Sato <ysato@users.sourceforge.jp>
Thu, 3 Mar 2011 08:40:46 +0000 (17:40 +0900)
commit53fedbea8fdf9014e5e201f91309be93678d4092
tree67ae7da807d65c4212db14ff3a99fe1be43b58eb
parent1ba24f12eb1f68b80790069a9fe615f24d20467c
parent35487d3e562a4d3b73603af302fb95646713707c
Merge branch 'master' into h8300

Conflicts:
arch/h8300/Kconfig
arch/h8300/Kconfig.debug