Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull trivial updates from Jiri Kosina.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  NTB: correct ntb_spad_count comment typo
  misc: ibmasm: fix typo in error message
  Remove references to dead make variable LINUX_INCLUDE
  Remove last traces of ikconfig.h
  treewide: Fix printk() message errors
  Documentation/device-mapper: s/getsize/getsz/

diff --cc Documentation/device-mapper/dm-crypt.txt
Simple merge

diff --cc drivers/acpi/Kconfig
Simple merge

diff --cc drivers/firmware/efi/libstub/Makefile
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_int.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_sp_commands.c
Simple merge

diff --cc drivers/net/wireless/ath/wil6210/txrx.c
Simple merge

diff --cc drivers/usb/dwc3/gadget.c
Simple merge