]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ca33c9 25b84fa)
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)
Conflicts:
drivers/xen/swiotlb-xen.c


Trivial merge
Linux kernel for KaRo TX COM modules