Update from upstream with manual merge of Yasunori Goto's
Tony Luck [Thu, 20 Oct 2005 17:41:44 +0000 (10:41 -0700)]
changes to swiotlb.c made in commit 281dd25cdc0d6903929b79183816d151ea626341
since this file has been moved from arch/ia64/lib/swiotlb.c to
lib/swiotlb.c

Signed-off-by: Tony Luck <tony.luck@intel.com>

1  2 
arch/ia64/Kconfig
arch/ia64/lib/Makefile
lib/swiotlb.c

Simple merge
Simple merge
diff --cc lib/swiotlb.c
Simple merge