]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
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)

Trivial merge