]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'swiotlb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 4 Nov 2011 02:41:23 +0000 (13:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 4 Nov 2011 02:41:23 +0000 (13:41 +1100)
commitedc50e8cbeddbab7890c77a4887f4af73c37391c
treeee0cc0900d9da0b02bdc7ef431ed91b88224dec1
parent4b600ce021730e3525d8a6cd917195c4f6feca33
parent25b84fa6892ba6517f292a6254bed39de77da1b5
Merge remote-tracking branch 'swiotlb/master'

Conflicts:
drivers/xen/swiotlb-xen.c