Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
commiteb47418dc56baaca33d270a868d8ddaa81150952
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Jul 2011 00:02:24 +0000 (22 17:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Jul 2011 00:02:24 +0000 (22 17:02 -0700)
tree16c0b09bacf3f6c25e5786afcfa741fa2a550ae5
parent2c9e88a1085b3183e5f92170a74980e5654f817b
parenta750036f35cda160ef77408ec92c3dc41f8feebb
Merge branch 'x86-asm-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix write lock scalability 64-bit issue
  x86: Unify rwsem assembly implementation
  x86: Unify rwlock assembly implementation
  x86, asm: Fix binutils 2.16 issue with __USER32_CS
  x86, asm: Cleanup thunk_64.S
  x86, asm: Flip RESTORE_ARGS arguments logic
  x86, asm: Flip SAVE_ARGS arguments logic
  x86, asm: Thin down SAVE/RESTORE_* asm macros
arch/x86/kernel/entry_64.S
arch/x86/lib/Makefile