From: Linus Torvalds Date: Thu, 3 Nov 2005 02:36:15 +0000 (-0800) Subject: Merge branch 'swiotlb' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 X-Git-Tag: v2.6.15-rc1~450^2~5 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3a7142371efdc95f4c5b5ffc188b18efdc4e64dd;p=~shefty%2Frdma-dev.git Merge branch 'swiotlb' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 --- 3a7142371efdc95f4c5b5ffc188b18efdc4e64dd