]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'xen/upstream/xen'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 03:02:02 +0000 (13:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 03:02:02 +0000 (13:02 +1000)
commit790a30d62b8764c35cc18573cb29192caf0c58b2
treed68cb29695168cb37a9a043da7c5a320d07fd74a
parentbac9d2cb3c4bb4bf49492b85c30f40baaa4ea2d2
parent59e9a6b1ee9fa3992860eb6c48a37b163e97d205
Merge remote-tracking branch 'xen/upstream/xen'

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