]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17e5ad6 ac9b9c6)
Update from upstream with manual merge of Yasunori Goto's
authorTony Luck <tony.luck@intel.com>
Thu, 20 Oct 2005 17:41:44 +0000 (10:41 -0700)
committerTony Luck <tony.luck@intel.com>
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 patch | diff1 | diff2 | blob | history
arch/ia64/lib/Makefile patch | diff1 | diff2 | blob | history
lib/swiotlb.c patch | diff1 | diff2 | blob | history

diff --cc arch/ia64/Kconfig
Simple merge
diff --cc arch/ia64/lib/Makefile
Simple merge
diff --cc lib/swiotlb.c
Simple merge
Linux 2.6 source tree