Merge branch 'stable/swiotlb-0.9' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Oct 2010 21:04:25 +0000 (14:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Oct 2010 21:04:25 +0000 (14:04 -0700)
commita9ccd80aadadef8c424142d41fddea7c0880f0e9
treed8f1078b9154ce4b4046d4fa2d744e22e260b0eb
parent81d1c3a52cd78fdbb9f0d80214fc9e7d49bf22c0
parente79f86b2ef9c0a8c47225217c1018b7d3d90101c
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