Merge HEAD from ../from-linus

author Len Brown <len.brown@intel.com>

Thu, 25 Aug 2005 16:45:49 +0000 (12:45 -0400)

committer Len Brown <len.brown@intel.com>

Thu, 25 Aug 2005 16:45:49 +0000 (12:45 -0400)
author Len Brown <len.brown@intel.com>
Thu, 25 Aug 2005 16:45:49 +0000 (12:45 -0400)
committer Len Brown <len.brown@intel.com>
Thu, 25 Aug 2005 16:45:49 +0000 (12:45 -0400)
diff --cc arch/x86_64/defconfig
Simple merge
diff --cc drivers/serial/Kconfig
Simple merge
author	Len Brown <len.brown@intel.com>
	Thu, 25 Aug 2005 16:45:49 +0000 (12:45 -0400)
committer	Len Brown <len.brown@intel.com>
	Thu, 25 Aug 2005 16:45:49 +0000 (12:45 -0400)
		1	2
arch/x86_64/defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/serial/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history