From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 15 Nov 2011 23:47:30 +0000 (+1100)
Subject: Merge remote-tracking branch 'swiotlb/master'
X-Git-Tag: next-20111116~42
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=827b3c870c6eeb67e399ec74aefb68f4c2cfd13f;p=karo-tx-linux.git

Merge remote-tracking branch 'swiotlb/master'

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

827b3c870c6eeb67e399ec74aefb68f4c2cfd13f