Skip to content
Commit 73686e78 authored by Al Viro's avatar Al Viro
Browse files

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.
parents b4edf06c 0a95a6d1
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment