Merge branch 'stable/xen-swiotlb.bugfix' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Jun 2011 19:52:44 +0000 (12:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Jun 2011 19:52:44 +0000 (12:52 -0700)
commit361932bf84657b5dc0779046c751f06998c0d81f
treed39ea8018bd35db9701d343411865529d89255a9
parent90494cc567319cd53574306f3b94fb3c7ff8fe88
parent5f98ecdbcef1920323d8777c0ba55dbd4335d3cf
Merge branch 'stable/xen-swiotlb.bugfix' of git://git./linux/kernel/git/konrad/swiotlb-2.6

* 'stable/xen-swiotlb.bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6:
  swiotlb: Export swioltb_nr_tbl and utilize it as appropiate.
drivers/xen/swiotlb-xen.c