projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e6e902 d208105)
Merge tag 'fsi-updates-2018-11-26' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 26 Nov 2018 07:02:51 +0000 (08:02 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 26 Nov 2018 07:02:51 +0000 (08:02 +0100)
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


Trivial merge
Domain: System / Kernel;