Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Aug 2009 02:41:05 +0000 (19:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Aug 2009 02:41:05 +0000 (19:41 -0700)
commit77f312a96dd1e01c49ccd872265e70a8346b53cc
tree7e6d1114dfaf0eb4732c97ad18819f23e4ebef09
parentdc8ed71eeb8adce08d3070f4130e12ee540baa59
parent142d44b0dd6741a64a7bdbe029110e7c1dcf1d23
Merge branch 'for-linus' of git://git./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()