aha/arch/blackfin
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
..
boot Blackfin: stick the CPU name into boot image name 2009-06-22 21:16:03 -04:00
configs Blackfin: update defconfigs 2009-06-22 21:16:01 -04:00
include/asm Input: add Blackfin rotary input driver 2009-07-23 01:15:09 -07:00
kernel Merge branch 'percpu-for-linus' into percpu-for-next 2009-08-14 14:45:31 +09:00
lib Blackfin: fix miscompilation in lshrdi3 2009-07-16 01:52:23 -04:00
mach-bf518 Blackfin: fix incomplete renaming of the bfin-twi-lcd driver 2009-07-16 01:52:32 -04:00
mach-bf527 Blackfin: fix incomplete renaming of the bfin-twi-lcd driver 2009-07-16 01:52:32 -04:00
mach-bf533 Blackfin: fix incomplete renaming of the bfin-twi-lcd driver 2009-07-16 01:52:32 -04:00
mach-bf537 Blackfin: bf537-stamp: fix irq decl for AD7142 2009-07-16 01:52:40 -04:00
mach-bf538 Blackfin: fix wrong CTS inversion 2009-07-16 01:52:30 -04:00
mach-bf548 Blackfin: fix incomplete renaming of the bfin-twi-lcd driver 2009-07-16 01:52:32 -04:00
mach-bf561 Blackfin: fix wrong CTS inversion 2009-07-16 01:52:30 -04:00
mach-common arch/blackfin: Add kmalloc NULL tests 2009-07-16 01:52:54 -04:00
mm Merge branch 'master' into for-next 2009-07-04 07:13:18 +09:00
oprofile Blackfin arch: remove hardware PM code, oprofile not use it 2009-01-07 23:14:39 +08:00
Kconfig Blackfin: fix GPTMR0_CLOCKSOURCE dependency on BFIN_GPTIMERS 2009-06-22 21:16:15 -04:00
Kconfig.debug Blackfin: make deferred hardware errors more exact 2009-06-12 06:11:44 -04:00
Makefile Blackfin: add support for bzip2/lzma compressed kernel images 2009-06-13 07:20:13 -04:00