From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Jul 2012 18:42:28 +0000 (-0700)
Subject: Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.6-rc1~164
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a065de0d257779ed1b8ee6e0c005ad6b1d989cef;p=profile%2Fcommon%2Fkernel-common.git

Merge branch 'x86-asm-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86/asm changes from Ingo Molnar:
 "Assorted single-commit improvements, as usual"

* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm/mtrr: Slightly simplify print_mtrr_state()
  x86/mm/mtrr: Fix alignment determination in range_to_mtrr()
  x86/copy_user_generic: Optimize copy_user_generic with CPU erms feature
  x86/alternatives: Use atomic_xchg() instead atomic_dec_and_test() for stop_machine_text_poke()
---

a065de0d257779ed1b8ee6e0c005ad6b1d989cef