more x86 merge fallout (uml, again)
authorAl Viro <viro@ftp.linux.org.uk>
Mon, 29 Oct 2007 04:34:31 +0000 (04:34 +0000)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 29 Oct 2007 14:41:32 +0000 (07:41 -0700)
commit7a78a1722380dd3cb5a009dbcd007f92b6b87743
tree87d1f54d566ddd0428f92095572d72a680faa989
parentca5cd877ae699e758e6f26efc11b01bf6631d427
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>
arch/um/Kconfig.i386
arch/um/Makefile-i386