From: Linus Torvalds Date: Wed, 16 Mar 2011 01:59:56 +0000 (-0700) Subject: Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v2.6.39-rc1~506 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=da849abeb86ddaa093b0935fde595e8e4dd21ffc;p=platform%2Fkernel%2Flinux-stable.git Merge branch 'x86-asm-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, binutils, xen: Fix another wrong size directive x86: Remove dead config option X86_CPU x86: Really print supported CPUs if PROCESSOR_SELECT=y x86: Fix a bogus unwind annotation in lib/semaphore_32.S um, x86-64: Fix UML build after adding CFI annotations to lib/rwsem_64.S x86: Remove unused bits from lib/thunk_*.S x86: Use {push,pop}_cfi in more places x86-64: Add CFI annotations to lib/rwsem_64.S x86, asm: Cleanup unnecssary macros in asm-offsets.c x86, system.h: Drop unused __SAVE/__RESTORE macros x86: Use bitmap library functions x86: Partly unify asm-offsets_{32,64}.c x86: Reduce back the alignment of the per-CPU data section --- da849abeb86ddaa093b0935fde595e8e4dd21ffc