diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-16 09:22:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-16 09:22:22 +0200 |
| commit | 58f2c391cc0560231d7636c39d31b1b26c9396b7 (patch) | |
| tree | 67956eea736a8763f67be8a52bcaf0d3fe4374f4 /drivers/fpga/xilinx-pr-decoupler.c | |
| parent | vmbus: add per-channel sysfs info (diff) | |
| parent | Linux 4.14-rc5 (diff) | |
| download | linux-58f2c391cc0560231d7636c39d31b1b26c9396b7.tar.xz linux-58f2c391cc0560231d7636c39d31b1b26c9396b7.zip | |
Merge 4.14-rc5 into char-misc-next
We need the fixes in here to resolve merge issues and for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/fpga/xilinx-pr-decoupler.c')
0 files changed, 0 insertions, 0 deletions