]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>

Trivial merge
local clone of linux.git