]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'xen/upstream/xen'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Apr 2012 02:25:16 +0000 (12:25 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Apr 2012 02:25:16 +0000 (12:25 +1000)
commitaecfa53a6a432078449e0d199a5281b265ea4791
tree03709f24e6338370d9576f61c4043b420e8ab8d8
parent5cfe975af7bfecb16a4fde9a3c9156049dcf5c51
parent59e9a6b1ee9fa3992860eb6c48a37b163e97d205
Merge remote-tracking branch 'xen/upstream/xen'

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