tree d8f1078b9154ce4b4046d4fa2d744e22e260b0eb
parent 81d1c3a52cd78fdbb9f0d80214fc9e7d49bf22c0
parent e79f86b2ef9c0a8c47225217c1018b7d3d90101c
author Linus Torvalds <torvalds@linux-foundation.org> 1287695065 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1287695065 -0700

Merge branch 'stable/swiotlb-0.9' of git://git.kernel.org/pub/scm/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