Merge branch 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Nov 2011 21:49:43 +0000 (13:49 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Nov 2011 21:49:43 +0000 (13:49 -0800)
commit9b5a4d4f65e260a109eaeea8bbc8062a7c58b55e
treeccb231635a020b629f95972dc67268d1156e5c03
parentcb3599926e3e7b3678583195effa61a03026ab0e
parent67589c71456b0346500629967292dea3802230b6
Merge branch 'for-3.2-fixes' of git://git./linux/kernel/git/tj/percpu

* 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu: explain why per_cpu_ptr_to_phys() is more complicated than necessary
  percpu: fix chunk range calculation
  percpu: rename pcpu_mem_alloc to pcpu_mem_zalloc