projects / linux-2.6-microblaze.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4edf06 0a95a6d)
Merge remote-tracking branch 'sparc/master' into work.sparc32
authorAl Viro <viro@zeniv.linux.org.uk>
Mon, 4 Jan 2021 01:05:34 +0000 (20:05 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Mon, 4 Jan 2021 01:07:31 +0000 (20:07 -0500)
... and resolve a non-textual conflict in arch/sparc/lib/memset.S -
EXT(...) stuff shouldn't be reintroduced on merge.

1  2 
arch/sparc/Kconfig patch | diff1 | diff2 | blob | history
arch/sparc/mm/srmmu.c patch | diff1 | diff2 | blob | history

diff --cc arch/sparc/Kconfig
Simple merge
diff --cc arch/sparc/mm/srmmu.c
Simple merge
MicroBlaze GIT Repository