From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 7 Nov 2011 00:43:55 +0000 (+1100)
Subject: Merge remote-tracking branch 'swiotlb/master'
X-Git-Tag: next-20111107~36
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3e1dabe3424c538ec6af5ee65a0462598f95ef1b;p=karo-tx-linux.git

Merge remote-tracking branch 'swiotlb/master'

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

3e1dabe3424c538ec6af5ee65a0462598f95ef1b