]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'swiotlb-xen' into xentip/linux-next
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>
Tue, 29 Oct 2013 00:41:45 +0000 (00:41 +0000)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Tue, 29 Oct 2013 00:41:45 +0000 (00:41 +0000)
commitaf8bdd968a7e69fbf6ff3e66815a9d1f907dbe11
treec22c78d68bfced9fbafb4f6b9dea9ad0c75b680f
parent511b28f3c74eab42a5f68de4bafb9af31bee6811
parent15177608c703e7b4aa29aa7c93b31001effe504c
Merge branch 'swiotlb-xen' into xentip/linux-next

Conflicts:
drivers/xen/swiotlb-xen.c
arch/x86/xen/mmu.c
drivers/xen/swiotlb-xen.c
lib/swiotlb.c