From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 Oct 2014 16:14:50 +0000 (+0200)
Subject: Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: fixes-against-v3.18-rc2~96
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=197fe6b0e6843b6859c6a1436ff19e3c444c0502;p=pandora-kernel.git

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

Pull x86 asm updates from Ingo Molnar:
 "The changes in this cycle were:

   - Speed up the x86 __preempt_schedule() implementation
   - Fix/improve low level asm code debug info annotations"

* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Unwind-annotate thunk_32.S
  x86: Improve cmpxchg8b_emu.S
  x86: Improve cmpxchg16b_emu.S
  x86/lib/Makefile: Remove the unnecessary "+= thunk_64.o"
  x86: Speed up ___preempt_schedule*() by using THUNK helpers
---

197fe6b0e6843b6859c6a1436ff19e3c444c0502
Reading git-diff-tree failed