Merge branch 'h8300-next' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 28 Feb 2022 22:57:40 +0000 (09:57 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 28 Feb 2022 22:57:40 +0000 (09:57 +1100)
commit7d12ca85e7d64dbbe8422b7347b93525e0cf0b10
tree3ea3d9dda2cfc26c502526c545bc161affc466cd
parent6563f90932cc78478df20ce4f63f91b0c6bb236c
parent1ec10274d436fbe77b821fbdf095b45d0888e46d
Merge branch 'h8300-next' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git

# Conflicts:
# arch/h8300/mm/memory.c
arch/h8300/Kconfig.cpu
arch/h8300/kernel/setup.c
drivers/net/ethernet/smsc/Kconfig
drivers/net/ethernet/smsc/smc91x.c
drivers/tty/serial/sh-sci.c