]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'swiotlb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 14 Nov 2011 00:32:59 +0000 (11:32 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 14 Nov 2011 00:32:59 +0000 (11:32 +1100)
commitfd42f6fe1401828fcbf72b2aede9f9b81f6957b7
tree7a204823b63eeffedca5303eaac31376463ca501
parenta8040619de726d5a50ff72bbd8a65327905e4be6
parent25b84fa6892ba6517f292a6254bed39de77da1b5
Merge remote-tracking branch 'swiotlb/master'

Conflicts:
drivers/xen/swiotlb-xen.c