Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Sep 2010 21:08:37 +0000 (14:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Sep 2010 21:08:37 +0000 (14:08 -0700)
commitce7db282a3830f57f5b05ec48288c23a5c4d66d5
tree8e191c4b2ffa1658d5c014da5cc6230fc58c1a59
parentcd4d4fc4137502f88ee871fc015a934dc28535e3
parent54157c44471f5e266508ac08d270f2bc5857e8bb
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: fix a mismatch between code and comment
  percpu: fix a memory leak in pcpu_extend_area_map()
  percpu: add __percpu notations to UP allocator
  percpu: handle __percpu notations in UP accessors