Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 May 2010 16:02:49 +0000 (09:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 May 2010 16:02:49 +0000 (09:02 -0700)
commit9c688c114c4665ac8c6da05b2f6b987f4adc6dae
treeb6f20a4d6fa4bb5efa0cad5d1dc75ec2b1c2b163
parent9d35bc1ec696ebfc5662a0d00b4d36564ff3af53
parent308eb7add8adaca8088c28a3f7610069b70d1ad6
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:
  ia64: add sparse annotation to __ia64_per_cpu_var()
  percpu: implement kernel memory based chunk allocation
  percpu: move vmalloc based chunk management into percpu-vm.c
  percpu: misc preparations for nommu support
  percpu: reorganize chunk creation and destruction
  percpu: factor out pcpu_addr_in_first/reserved_chunk() and update per_cpu_ptr_to_phys()