diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2021-01-03 20:05:34 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2021-01-03 20:07:31 -0500 |
| commit | 73686e787b495a85551e2e99c459adde6836eb31 (patch) | |
| tree | 2b26a24240f11442f326da096f2e824a68252674 /arch/x86 | |
| parent | b4edf06c8aaae30ef926bd6853df6e59a7579ee9 (diff) | |
| parent | 0a95a6d1a4cd6e10e70f8a6c93dc2ecd02e7d6ab (diff) | |
Merge remote-tracking branch 'sparc/master' into work.sparc32
... and resolve a non-textual conflict in arch/sparc/lib/memset.S -
EXT(...) stuff shouldn't be reintroduced on merge.
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions