tree 7e6d1114dfaf0eb4732c97ad18819f23e4ebef09
parent dc8ed71eeb8adce08d3070f4130e12ee540baa59
parent 142d44b0dd6741a64a7bdbe029110e7c1dcf1d23
author Linus Torvalds <torvalds@linux-foundation.org> 1250649665 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1250649665 -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: use the right flag for get_vm_area()
  percpu, sparc64: fix sparse possible cpu map handling
  init: set nr_cpu_ids before setup_per_cpu_areas()