]> 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: fa40b01 5985fb3)
Merge branch 'upstream/ticketlock-cleanup' into upstream/xen
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Mon, 29 Aug 2011 21:50:53 +0000 (14:50 -0700)
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Mon, 29 Aug 2011 21:50:53 +0000 (14:50 -0700)
* upstream/ticketlock-cleanup:
  x86/cmpxchg: use __compiletime_error() to make usage messages a bit nicer


Trivial merge
Linux kernel for KaRo TX COM modules