git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ca5cd87)
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)
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 patch | blob | history
arch/um/Makefile-i386 patch | blob | history

diff --cc arch/um/Kconfig.i386
Simple merge
diff --cc arch/um/Makefile-i386
Simple merge
Pandora Kernel Repository