tree afe56978729300df96b002a064c9de927fadcfab
parent 91b745016c12d440386c40fb76ab69c8e08cbc06
parent 9329ba9704f6bd51a735982e0d4a3eed72c3294f
author Linus Torvalds <torvalds@linux-foundation.org> 1287793896 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1287793896 -0700

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:
  percpu: update comments to reflect that percpu allocations are always zero-filled
  percpu: Optimize __get_cpu_var()
  x86, percpu: Optimize this_cpu_ptr
  percpu: clear memory allocated with the km allocator
  percpu: fix build breakage on s390 and cleanup build configuration tests
  percpu: use percpu allocator on UP too
  percpu: reduce PCPU_MIN_UNIT_SIZE to 32k
  vmalloc: pcpu_get/free_vm_areas() aren't needed on UP

Fixed up trivial conflicts in include/linux/percpu.h