diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 02:41:07 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 02:41:07 +0400 |
| commit | 3d1a3bda65d2f48fead6f0727f2f392c15206852 (patch) | |
| tree | e8856da7d596333734710b1299411eff9bac3271 /arch/cris/include/asm/atomic.h | |
| parent | c84a1e32ee58fc1cc9d3fd42619b917cce67e30a (diff) | |
| parent | 577ed45ec56e9c43269df1c4a05c59ed19ea8e6a (diff) | |
| download | linux-3d1a3bda65d2f48fead6f0727f2f392c15206852.tar.xz | |
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
Diffstat (limited to 'arch/cris/include/asm/atomic.h')
0 files changed, 0 insertions, 0 deletions