Skip to content
Commit 7a78a172 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

more x86 merge fallout (uml, again) 



arch/i386/{Kconfig,Makefile}.cpu got moved

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ca5cd877
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment