Merge branch 'k.o/for-rc' into k.o/wip/dl-for-next
authorDoug Ledford <dledford@redhat.com>
Fri, 23 Feb 2018 03:27:20 +0000 (22:27 -0500)
committerDoug Ledford <dledford@redhat.com>
Fri, 23 Feb 2018 03:27:20 +0000 (22:27 -0500)
There is a 14 patch series waiting to come into for-next that has a
dependecy on code submitted into this kernel's for-rc series.  So, merge
the for-rc branch into the current for-next in order to make the patch
series apply cleanly.

Signed-off-by: Doug Ledford <dledford@redhat.com>

Trivial merge