From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 17 Apr 2012 03:02:02 +0000 (+1000)
Subject: Merge remote-tracking branch 'xen/upstream/xen'
X-Git-Tag: next-20120417~19
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=790a30d62b8764c35cc18573cb29192caf0c58b2;p=karo-tx-linux.git

Merge remote-tracking branch 'xen/upstream/xen'

Conflicts:
	arch/x86/include/asm/cmpxchg.h
---

790a30d62b8764c35cc18573cb29192caf0c58b2