summaryrefslogtreecommitdiff
path: root/drivers/devfreq
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-09-21 09:06:42 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-09-21 09:06:42 +0200
commit629b9111535f2a2607bbea1599d285a25f32835d (patch)
tree81a37df4e13842d5ea3d54b619e929e2b6e9ffed /drivers/devfreq
parent673d74683627bc78eaca1fdbe24b6cf45c5c8d84 (diff)
parentba4f184e126b751d1bffad5897f263108befc780 (diff)
Merge 5.0-rc6 into usb-next
We want the USB fixes in here, and this resolves a merge issue in the uas driver. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/devfreq')
0 files changed, 0 insertions, 0 deletions