From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 Aug 2010 17:36:39 +0000 (-0700)
Subject: Merge branch 'stable/swiotlb-0.8.3' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.36-rc1~583
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4a35cee066df1b1958e25e71595b3845d06b192e;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'stable/swiotlb-0.8.3' of git://git./linux/kernel/git/konrad/swiotlb-2.6

* 'stable/swiotlb-0.8.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6:
  swiotlb: Make swiotlb bookkeeping functions visible in the header file.
  swiotlb: search and replace "int dir" with "enum dma_data_direction dir"
  swiotlb: Make internal bookkeeping functions have 'swiotlb_tbl' prefix.
  swiotlb: add the swiotlb initialization function with iotlb memory
  swiotlb: add swiotlb_tbl_map_single library function
---

4a35cee066df1b1958e25e71595b3845d06b192e