Merge remote-tracking branch 'h8300/h8300-next' into master

diff --cc arch/h8300/kernel/setup.c
Simple merge

diff --cc drivers/clocksource/h8300_timer8.c
Simple merge

diff --cc drivers/net/ethernet/smsc/Kconfig
Simple merge

diff --cc drivers/net/ethernet/smsc/smc91x.c
Simple merge