From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Jun 2014 22:41:07 +0000 (-0700)
Subject: Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~3465^2~25
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3d1a3bda65d2f48fead6f0727f2f392c15206852;p=firefly-linux-kernel-4.4.55.git

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

Pull x86 asm cleanups from Ingo Molnar:
 "A handful of entry_64.S cleanups"

* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86_64, entry: Merge paranoidzeroentry_ist into idtentry
  x86_64, entry: Merge most 64-bit asm entry macros
  x86_64, entry: Add missing 'DEFAULT_FRAME 0' entry annotations
---

3d1a3bda65d2f48fead6f0727f2f392c15206852