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
..
.gitignore	m68k: Add vmlinux.lds to .gitignore	2009-01-12 20:56:32 +01:00
asm-offsets.c	locking, m68k/asm-offsets: Rename signal defines	2009-09-01 09:38:03 +02:00
dma.c	m68k: Add missing dma_sync_single_range_for_{cpu,device}()	2008-10-14 10:23:27 -07:00
entry.S	locking, m68k/asm-offsets: Rename pt_regs offset defines	2009-08-31 18:08:49 +02:00
head.S	m68k: convert to use __HEAD and HEAD_TEXT macros.	2009-04-26 09:20:38 -07:00
ints.c	m68k: Fix off-by-one in m68k_setup_user_interrupt()	2008-11-15 11:36:06 -08:00
m68k_ksyms.c
Makefile	m68k: remove the dead PCI code	2008-10-14 10:23:27 -07:00
module.c	module: cleanup FIXME comments about trimming exception table entries.	2009-06-12 21:47:05 +09:30
module.lds
process.c	mm: consolidate init_mm definition	2009-06-16 19:47:28 -07:00
ptrace.c
setup.c	m68k: Kill several external declarations in source files	2009-01-12 20:56:34 +01:00
signal.c	m68k: Wire up sys_restart_syscall	2009-01-12 20:56:43 +01:00
sun3-head.S	m68k: arch/m68k/kernel/sun3-head.S needs <linux/init.h>	2009-04-28 16:07:18 -07:00
sys_m68k.c
time.c	m68k: Hook up rtc-generic	2009-04-02 01:05:31 +00:00
traps.c	ptrace: remove PT_DTRACE from m68k, m68knommu	2009-06-18 13:03:48 -07:00
vmlinux-std.lds	linker script: unify usage of discard definition	2009-07-09 11:27:40 +09:00
vmlinux-sun3.lds	linker script: unify usage of discard definition	2009-07-09 11:27:40 +09:00
vmlinux.lds.S