Update from upstream with manual merge of Yasunori Goto's

author Tony Luck <tony.luck@intel.com>

Thu, 20 Oct 2005 17:41:44 +0000 (10:41 -0700)

committer Tony Luck <tony.luck@intel.com>

Thu, 20 Oct 2005 17:41:44 +0000 (10:41 -0700)
author Tony Luck <tony.luck@intel.com>
Thu, 20 Oct 2005 17:41:44 +0000 (10:41 -0700)
committer Tony Luck <tony.luck@intel.com>
Thu, 20 Oct 2005 17:41:44 +0000 (10:41 -0700)
diff --cc arch/ia64/Kconfig
Simple merge
diff --cc arch/ia64/lib/Makefile
Simple merge
diff --cc lib/swiotlb.c
Simple merge
author	Tony Luck <tony.luck@intel.com>
	Thu, 20 Oct 2005 17:41:44 +0000 (10:41 -0700)
committer	Tony Luck <tony.luck@intel.com>
	Thu, 20 Oct 2005 17:41:44 +0000 (10:41 -0700)
		1	2
arch/ia64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/ia64/lib/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
lib/swiotlb.c	patch \|	diff1 \|	diff2 \|	blob \| history