Merge remote-tracking branch 'ntb/ntb-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 8 Feb 2019 05:58:10 +0000 (16:58 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 8 Feb 2019 05:58:10 +0000 (16:58 +1100)
1  2 
drivers/ntb/hw/mscc/ntb_hw_switchtec.c
include/linux/switchtec.h

Simple merge