tree 87d1f54d566ddd0428f92095572d72a680faa989
parent ca5cd877ae699e758e6f26efc11b01bf6631d427
author Al Viro <viro@ftp.linux.org.uk> 1193632471 +0000
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1193668892 -0700

more x86 merge fallout (uml, again)

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

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>