aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-08-09 16:45:54 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-08-09 16:45:54 +0200
commitcec2caedd979e8778b61ca7dd15fa7ec8fcf7162 (patch)
treea57cb588ff7a326f11df234ad923d247d271ea41 /drivers/char
parentmisc: Remove spear13xx pcie gadget driver (diff)
parentdt-bindings: fpga: Consolidate bridge properties (diff)
downloadlinux-dev-cec2caedd979e8778b61ca7dd15fa7ec8fcf7162.tar.xz
linux-dev-cec2caedd979e8778b61ca7dd15fa7ec8fcf7162.zip
Merge tag 'fpga-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga into char-misc-next
Moritz writes: FPGA Manager changes for 5.4-rc1 Here is the first set of changes for the 5.4-rc1 merge window. They're all more or less cleanup patches: - Carlos' patch addresses a checkpatch warning - My first patch changes the return type of a function to align it with the fact that nothing checks the return value and it uncoditionally returned 0 anyways - My second patch somehow fell through the cracks before and cleans up the FPGA bridge bindings by consolidating them instead of repeating the same paragraph over and over again. All of these patches have been in the last few linux-next releases without issues. Signed-off-by: Moritz Fischer <mdf@kernel.org> * tag 'fpga-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga: dt-bindings: fpga: Consolidate bridge properties fpga: altera-pr-ip: Make alt_pr_unregister function void fpga: altera-cvp: Fix function definition argument
Diffstat (limited to 'drivers/char')
0 files changed, 0 insertions, 0 deletions