]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'swiotlb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 9 Nov 2011 00:43:46 +0000 (11:43 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 9 Nov 2011 00:43:46 +0000 (11:43 +1100)
commit947d17fd78f62b01e387f4dd55f66d9b1bc1edd2
tree4948467a4935a2b74f78dd012aeb2c854cd75094
parentfe5ccbe4bdd6b918f9a1d34636ca42ba9c835954
parent25b84fa6892ba6517f292a6254bed39de77da1b5
Merge remote-tracking branch 'swiotlb/master'

Conflicts:
drivers/xen/swiotlb-xen.c