From: Doug Ledford Date: Fri, 18 Aug 2017 18:12:04 +0000 (-0400) Subject: Merge branch 'k.o/for-4.13-rc' into k.o/for-next X-Git-Tag: v4.14-rc1~178^2~116 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b0e32e20e3c63778d8c20a40d8bec8b18baffecb;p=users%2Fjedix%2Flinux-maple.git Merge branch 'k.o/for-4.13-rc' into k.o/for-next Merging our (hopefully) final -rc pull branch into our for-next branch because some of our pending patches won't apply cleanly without having the -rc patches in our tree. Signed-off-by: Doug Ledford --- b0e32e20e3c63778d8c20a40d8bec8b18baffecb