diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-26 10:02:51 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-26 10:02:51 +0300 |
| commit | 032371a1e673275202c047537726f4216d7dbf0b (patch) | |
| tree | 6617c73b795f51f1e86a6cdb79fadb7ed5d69829 /drivers/android | |
| parent | 2e6e902d185027f8e3cb8b7305238f7e35d6a436 (diff) | |
| parent | d20810530b7109a95abef5130e6dcec09c5180d7 (diff) | |
| download | linux-032371a1e673275202c047537726f4216d7dbf0b.tar.xz | |
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
Diffstat (limited to 'drivers/android')
0 files changed, 0 insertions, 0 deletions