From: Jiri Kosina Date: Tue, 20 Jun 2017 08:52:46 +0000 (+0200) Subject: Merge branch 'for-4.12/upstream-fixes' into for-linus X-Git-Tag: v4.12-rc7~26^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=900a88ef348803cd2ad2aeb13ffe06e807c6ce65;p=users%2Fjedix%2Flinux-maple.git Merge branch 'for-4.12/upstream-fixes' into for-linus --- 900a88ef348803cd2ad2aeb13ffe06e807c6ce65