From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 26 Nov 2018 07:02:51 +0000 (+0100)
Subject: Merge tag 'fsi-updates-2018-11-26' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=032371a1e673275202c047537726f4216d7dbf0b;p=linux.git

Merge tag 'fsi-updates-2018-11-26' of git://git./linux/kernel/git/benh/linux-fsi char-misc-linus

Ben writes:
  "Here are two very minor fixes for FSI. One from Arnd is a Kconfig
   fixup and has been rusting away in my tree for a while (I had
   forgotten about it). The other one just removes a duplicate #include,
   courtesy of Brajeswar Ghosh."

* tag 'fsi-updates-2018-11-26' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/linux-fsi:
  fsi: fsi-scom.c: Remove duplicate header
  fsi: master-ast-cf: select GENERIC_ALLOCATOR
---

032371a1e673275202c047537726f4216d7dbf0b