From: Borislav Petkov <bp@suse.de>
Date: Sat, 12 May 2018 09:07:07 +0000 (+0200)
Subject: Merge tag 'socfpga_updates_for_v4.18_part2' into edac-for-4.18
X-Git-Tag: v4.18-rc1~122^2~9
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1e9e31cf171c68c5544e67ec4b10bb55bd50d370;p=linux.git

Merge tag 'socfpga_updates_for_v4.18_part2' into edac-for-4.18

Pick up dependent socfpga_stratix10.dtsi changes from Dinh's tree to
avoid merge conflicts with that same file in his tree.

Signed-off-by: Borislav Petkov <bp@suse.de>
---

1e9e31cf171c68c5544e67ec4b10bb55bd50d370