OSDN Git Service

Merge branch 'master' into h8300
authorYoshinori Sato <ysato@users.sourceforge.jp>
Sun, 14 Dec 2014 08:45:53 +0000 (17:45 +0900)
committerYoshinori Sato <ysato@users.sourceforge.jp>
Sun, 14 Dec 2014 08:45:53 +0000 (17:45 +0900)
commitb2a6ab09e40db008ee9b49aa625e114d32cbf6de
tree244fc131afef9beaa3ae98e2077d7373400b4d63
parent64db21bed77e0487ca3f754e4c383f14a502d20c
parent236ddd30a9eada18151919dfd47f3bf6035cbd02
Merge branch 'master' into h8300

Conflicts:
arch/h8300/Kconfig
arch/h8300/Makefile
arch/h8300/kernel/vmlinux.lds.S
drivers/tty/serial/sh-sci.c
sound/soc/codecs/wm8994.c
arch/h8300/Kconfig
arch/h8300/Makefile
arch/h8300/kernel/vmlinux.lds.S