]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'swiotlb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 03:40:11 +0000 (14:40 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 03:40:11 +0000 (14:40 +1100)
commitfa8ca710beff2f5bda95eddd77f19e7495c569ac
tree9142f4f15f5da46772ee0f152c1d9dcd13e60099
parent6ca33c9018773c9950fa80692739b056f6d1b162
parent25b84fa6892ba6517f292a6254bed39de77da1b5
Merge remote-tracking branch 'swiotlb/master'

Conflicts:
drivers/xen/swiotlb-xen.c