From: Linus Torvalds Date: Thu, 21 Oct 2010 21:04:25 +0000 (-0700) Subject: Merge branch 'stable/swiotlb-0.9' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a9ccd80aadadef8c424142d41fddea7c0880f0e9;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'stable/swiotlb-0.9' of git://git./linux/kernel/git/konrad/swiotlb-2.6 * 'stable/swiotlb-0.9' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6: swiotlb: Use page alignment for early buffer allocation swiotlb: make io_tlb_overflow static --- a9ccd80aadadef8c424142d41fddea7c0880f0e9