From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 26 Oct 2007 20:49:29 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/x86
X-Git-Tag: v2.6.24-rc2~131
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e4bd10c9b7e9ed65132f5935328275deb760384;p=linux-2.6

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/x86

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/x86:
  x86: kill the old i386 and x86_64 directories
  x86: move i386 and x86_64 Kconfig files to x86 directory
  kconfig: small code refactoring in kconfig Makefile
  x86: unification of i386 and x86_64 Kconfig.debug
  x86: move defconfig files for i386 and x86_64 to x86
  x86: move i386 and x86_64 Makefiles to arch/x86
---

0e4bd10c9b7e9ed65132f5935328275deb760384