From: Al Viro <viro@ftp.linux.org.uk>
Date: Mon, 29 Oct 2007 04:34:31 +0000 (+0000)
Subject: more x86 merge fallout (uml, again)
X-Git-Tag: v2.6.24-rc2~116
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a78a1722380dd3cb5a009dbcd007f92b6b87743;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed