From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Mon, 29 Aug 2011 21:50:53 +0000 (-0700)
Subject: Merge branch 'upstream/ticketlock-cleanup' into upstream/xen
X-Git-Tag: next-20110830~15^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e7b806084d6866bf68d8bf11be977f464e7a3a94;p=karo-tx-linux.git

Merge branch 'upstream/ticketlock-cleanup' into upstream/xen

* upstream/ticketlock-cleanup:
  x86/cmpxchg: use __compiletime_error() to make usage messages a bit nicer
---

e7b806084d6866bf68d8bf11be977f464e7a3a94