more x86 merge fallout (uml, again)

2007-10-29 Thread Linux Kernel Mailing List
29 04:34:31 2007 + Committer: Linus Torvalds [EMAIL PROTECTED] CommitDate: Mon Oct 29 07:41:32 2007 -0700 more x86 merge fallout (uml, again) arch/i386/{Kconfig,Makefile}.cpu got moved Signed-off-by: Al Viro [EMAIL PROTECTED] Signed-off-by: Linus Torvalds [EMAIL

x86 merge fallout: uml

2007-10-29 Thread Linux Kernel Mailing List
29 04:31:16 2007 + Committer: Linus Torvalds [EMAIL PROTECTED] CommitDate: Mon Oct 29 07:41:32 2007 -0700 x86 merge fallout: uml Don't undef __i386__/__x86_64__ in uml anymore, make sure that (few) places that required adjusting the ifdefs got those. Signed-off-by: Al