projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 305d0e0 91fdd82)
Merge tag 'socfpga_updates_for_v4.18_part2' into edac-for-4.18
authorBorislav Petkov <bp@suse.de>
Sat, 12 May 2018 09:07:07 +0000 (11:07 +0200)
committerBorislav Petkov <bp@suse.de>
Sat, 12 May 2018 09:07:07 +0000 (11:07 +0200)
commit1e9e31cf171c68c5544e67ec4b10bb55bd50d370
treeba44f38f2eb348e6a3bd1942ac1e0076a5a5f078tree | snapshot
parent305d0e006a1736fbfec25e7a2d1e813694f82ed0commit | diff
parent91fdd8274f32987760bbdb2981b4a896e338c09ecommit | diff
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>