Merge branch 'master' into backport_4.4_to_4.7

Author: lsgunth

Kbuild

@@ -1,4 +1,4 @@
 LINUXINCLUDE := -I$(src) $(LINUXINCLUDE)
 
-obj-m := switchtec.o switchtec_ntb.o
+obj-m := switchtec.o ntb_hw_switchtec.o
 ccflags-y := -Wall -Werror -Werror=implicit-function-declaration

README.rst

@@ -83,7 +83,7 @@ The following IOCTLs are also supported by the device:
 Non-Transparent Bridge (NTB) Driver
 ===================================
 
-An NTB driver is provided for the switchtec hardware in switchec_ntb.
+An NTB driver is provided for the switchtec hardware in switchtec_ntb.
 Currently, it only supports switches configured with exactly 2
 partitions. It also requires the following configuration settings: