Merge tag 'fsi-updates-2018-11-26' of git://git.kernel.org/pub/scm/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
