commit | 3d1a3bda65d2f48fead6f0727f2f392c15206852 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 03 15:41:07 2014 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 03 15:41:07 2014 -0700 |
tree | e8856da7d596333734710b1299411eff9bac3271 | |
parent | c84a1e32ee58fc1cc9d3fd42619b917cce67e30a [diff] | |
parent | 577ed45ec56e9c43269df1c4a05c59ed19ea8e6a [diff] |
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/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