Merge branch 'swiotlb' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 3 Nov 2005 02:36:15 +0000 (18:36 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 3 Nov 2005 02:36:15 +0000 (18:36 -0800)
commit3a7142371efdc95f4c5b5ffc188b18efdc4e64dd
tree29f2fbc9b0932ebeeb85dad6b309c1a22f9b1026
parentec1890c5df451799dec969a3581ff72e1934b5ee
parentc7fb577e2a6cb04732541f2dc402bd46747f7558
Merge branch 'swiotlb' of git://git./linux/kernel/git/aegl/linux-2.6