]> 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: 1ea6b8f 2025910)
Merge branch 'upstream/ticketlock-cleanup' into upstream/xen
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Tue, 15 Nov 2011 21:54:36 +0000 (13:54 -0800)
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Tue, 15 Nov 2011 21:54:36 +0000 (13:54 -0800)
* upstream/ticketlock-cleanup:
  x86: consolidate xchg and xadd macros
  x86/cmpxchg: add a locked add() helper


Trivial merge
Linux kernel for KaRo TX COM modules