summaryrefslogtreecommitdiffstats
path: root/drivers/bus
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-02-26 15:32:00 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-02-26 15:32:00 +0100
commit36e9f7203e05090031a5356be043a9be342e383c (patch)
tree27877737c3bb3c00ee9caeece7d671f65cf91252 /drivers/bus
parentstaging: speakup: remove space after a cast (diff)
parentLinux 4.16-rc3 (diff)
downloadlinux-36e9f7203e05090031a5356be043a9be342e383c.tar.xz
linux-36e9f7203e05090031a5356be043a9be342e383c.zip
Merge 4.16-rc3 into staging-next
We want the IIO/Staging fixes in here, and to resolve a merge problem with the move of the fsl-mc code. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/bus')
0 files changed, 0 insertions, 0 deletions