summaryrefslogtreecommitdiff
path: root/drivers/rapidio
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-22 00:18:44 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-22 00:18:44 +0300
commit817de6b85914a3dda72b971c074d4d342965fba0 (patch)
treedf0a4563a04aadb8f8595f72392d66d65797c455 /drivers/rapidio
parent7dc7967fc39af81191558f63eeaf3d2b83899b1c (diff)
parent085b7755808aa11f78ab9377257e1dad2e6fa4bb (diff)
downloadlinux-817de6b85914a3dda72b971c074d4d342965fba0.tar.xz
Merge 5.1-rc6 into staging-next
We want the fixes in here as well as this resolves an iio driver merge issue. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/rapidio')
0 files changed, 0 insertions, 0 deletions