From: Linus Torvalds <torvalds@g5.osdl.org>
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: firefly_0821_release~40169^2~34
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3a7142371efdc95f4c5b5ffc188b18efdc4e64dd;p=firefly-linux-kernel-4.4.55.git

Merge branch 'swiotlb' of git://git./linux/kernel/git/aegl/linux-2.6
---

3a7142371efdc95f4c5b5ffc188b18efdc4e64dd