From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 Jun 2011 19:52:44 +0000 (-0700)
Subject: Merge branch 'stable/xen-swiotlb.bugfix' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.0-rc3~21
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=361932bf84657b5dc0779046c751f06998c0d81f

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.
---

361932bf84657b5dc0779046c751f06998c0d81f