Merge branch 'rmobile/mackerel' into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile
Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
Showing
想要评论请 注册 或 登录
Conflicts:
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile
Signed-off-by: NPaul Mundt <lethal@linux-sh.org>