Linus Torvalds ada3fa1505 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (46 commits) powerpc64: convert to dynamic percpu allocator sparc64: use embedding percpu first chunk allocator percpu: kill lpage first chunk allocator x86,percpu: use embedding for 64bit NUMA and page for 32bit NUMA percpu: update embedding first chunk allocator to handle sparse units percpu: use group information to allocate vmap areas sparsely vmalloc: implement pcpu_get_vm_areas() vmalloc: separate out insert_vmalloc_vm() percpu: add chunk->base_addr percpu: add pcpu_unit_offsets[] percpu: introduce pcpu_alloc_info and pcpu_group_info percpu: move pcpu_lpage_build_unit_map() and pcpul_lpage_dump_cfg() upward percpu: add @align to pcpu_fc_alloc_fn_t percpu: make @dyn_size mandatory for pcpu_setup_first_chunk() percpu: drop @static_size from first chunk allocators percpu: generalize first chunk allocator selection percpu: build first chunk allocators selectively percpu: rename 4k first chunk allocator to page percpu: improve boot messages percpu: fix pcpu_reclaim() locking ... Fix trivial conflict as by Tejun Heo in kernel/sched.c		2009-09-15 09:39:44 -07:00
..
configs	sgi-gru: remove SGI_GRU as a valid config option for ia64 configs with SGI_UV	2009-04-02 19:05:07 -07:00
dig	x86, ia64: convert to use generic dma_map_ops struct	2009-01-06 14:06:57 +01:00
hp	net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions	2009-07-05 19:16:04 -07:00
ia32	generic compat_sys_ustat	2009-03-27 14:43:57 -04:00
include/asm	Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6	2009-09-15 09:18:07 -07:00
kernel	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-09-15 09:39:44 -07:00
kvm	KVM: Reduce runnability interface with arch support code	2009-09-10 08:33:13 +03:00
lib	[IA64] fix csum_ipv6_magic()	2009-09-02 09:14:48 -07:00
mm	Move FAULT_FLAG_xyz into handle_mm_fault() callers	2009-06-21 13:08:22 -07:00
oprofile	oprofile: more whitespace fixes	2008-10-15 20:55:51 +02:00
pci	ia64/PCI: adjust section annotation for pcibios_setup()	2009-06-30 16:26:53 -07:00
scripts	ia64/pv_ops/pvchecker: support mov = ar.itc paravirtualization	2009-03-26 10:50:09 -07:00
sn	Merge branch 'master' into for-next	2009-07-04 07:13:18 +09:00
uv	[IA64] Simplify SGI uv vs. sn2 driver issues	2008-11-04 11:29:39 -08:00
xen	rcu: Simplify rcu_pending()/rcu_check_callbacks() API	2009-08-23 10:32:39 +02:00
install.sh	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Kconfig	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-09-15 09:39:44 -07:00
Kconfig.debug	[PATCH] Move Kprobes and Oprofile to "Instrumentation Support" menu	2005-11-07 07:53:35 -08:00
Makefile	arch/ia64/Makefile: Remove -mtune=merced in IA64 kernel build	2009-08-11 14:52:11 -07:00
module.lds	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00