From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Nov 2011 03:40:11 +0000 (+1100)
Subject: Merge remote-tracking branch 'swiotlb/master'
X-Git-Tag: next-20111103~42
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fa8ca710beff2f5bda95eddd77f19e7495c569ac;p=karo-tx-linux.git

Merge remote-tracking branch 'swiotlb/master'

Conflicts:
	drivers/xen/swiotlb-xen.c
---

fa8ca710beff2f5bda95eddd77f19e7495c569ac