Linus Torvalds bf67f3a5c4 Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip ... Pull smp hotplug cleanups from Thomas Gleixner: "This series is merily a cleanup of code copied around in arch/* and not changing any of the real cpu hotplug horrors yet. I wish I'd had something more substantial for 3.5, but I underestimated the lurking horror..." Fix up trivial conflicts in arch/{arm,sparc,x86}/Kconfig and arch/sparc/include/asm/thread_info_32.h * 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (79 commits) um: Remove leftover declaration of alloc_task_struct_node() task_allocator: Use config switches instead of magic defines sparc: Use common threadinfo allocator score: Use common threadinfo allocator sh-use-common-threadinfo-allocator mn10300: Use common threadinfo allocator powerpc: Use common threadinfo allocator mips: Use common threadinfo allocator hexagon: Use common threadinfo allocator m32r: Use common threadinfo allocator frv: Use common threadinfo allocator cris: Use common threadinfo allocator x86: Use common threadinfo allocator c6x: Use common threadinfo allocator fork: Provide kmemcache based thread_info allocator tile: Use common threadinfo allocator fork: Provide weak arch_release_[task_struct|thread_info] functions fork: Move thread info gfp flags to header fork: Remove the weak insanity sh: Remove cpu_idle_wait() ...		2012-05-21 19:43:57 -07:00
..
drivers	rcu: Move PREEMPT_RCU preemption to switch_to() invocation	2012-05-02 14:43:23 -07:00
include	um: Remove leftover declaration of alloc_task_struct_node()	2012-05-08 15:35:08 +02:00
kernel	um: Use generic init_task	2012-05-05 13:00:26 +02:00
os-Linux	um: use the right ifdef around exports in user_syms.c	2012-03-25 00:29:55 +01:00
scripts	um: don't bother trying to rebuild CHECKFLAGS for USER_OBJS	2012-03-25 00:29:56 +01:00
sys-ia64
sys-ppc	um: change to new flag variables	2011-03-17 14:02:57 +01:00
.gitignore	um: tell git to ignore generated files	2010-03-06 11:26:28 -08:00
defconfig	um: Update defconfig	2012-03-25 00:46:51 +01:00
Kconfig.char	um: clean Kconfig up a bit	2011-11-02 14:15:29 +01:00
Kconfig.common	init_task: Replace CONFIG_HAVE_GENERIC_INIT_TASK	2012-05-05 13:00:46 +02:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Kconfig.net	Fix common misspellings	2011-03-31 11:26:23 -03:00
Kconfig.rest	um: switch to use of drivers/Kconfig	2011-11-02 14:15:41 +01:00
Kconfig.um	um: clean Kconfig up a bit	2011-11-02 14:15:29 +01:00
Makefile	um: Switch to large mcmodel on x86_64	2012-03-25 00:29:57 +01:00
Makefile-ia64
Makefile-os-Linux
Makefile-ppc
Makefile-skas