]> 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: da04671 59e9a6b)
Merge remote-tracking branch 'xen/upstream/xen'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 11 Apr 2012 04:03:43 +0000 (14:03 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 11 Apr 2012 04:03:43 +0000 (14:03 +1000)
Conflicts:
arch/x86/include/asm/cmpxchg.h


Trivial merge
Linux kernel for KaRo TX COM modules