aboutsummaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-16 22:04:13 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-16 22:04:13 +0200
commit7dc074348eb85d48f7a1fa96879458f4becf68a7 (patch)
treeaf626c941574ea68f7d74da04d81e302fbc14a68 /CREDITS
parent6029b7ac292abd36f8dff7f75e83dfd01332b265 (diff)
parent7876320f88802b22d4e2daf7eb027dd14175a0f8 (diff)
Merge 4.19-rc4 into staging-next
Handle the merge issues and take the iio and staging driver fixes. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions