]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'swiotlb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 15 Nov 2011 23:47:30 +0000 (10:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 15 Nov 2011 23:47:30 +0000 (10:47 +1100)
commit827b3c870c6eeb67e399ec74aefb68f4c2cfd13f
treebe46ec1eceaedcd986aaf9e68714a8113f6c7349
parent733f4f63ed40308d408e3c8b7df255565bdb6338
parent25b84fa6892ba6517f292a6254bed39de77da1b5
Merge remote-tracking branch 'swiotlb/master'

Conflicts:
drivers/xen/swiotlb-xen.c