]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'swiotlb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Nov 2011 00:43:55 +0000 (11:43 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Nov 2011 00:43:55 +0000 (11:43 +1100)
commit3e1dabe3424c538ec6af5ee65a0462598f95ef1b
treed6041f161aee3423ce4ff35cf0c010c27de21164
parentf0b7366c98718fb6a33f5652b720b65a03149a44
parent25b84fa6892ba6517f292a6254bed39de77da1b5
Merge remote-tracking branch 'swiotlb/master'

Conflicts:
drivers/xen/swiotlb-xen.c