Merge branch 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 Dec 2011 23:13:36 +0000 (15:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 Dec 2011 23:13:36 +0000 (15:13 -0800)
commit64edb05e3c7497c21496a2bafbdbac453f2a9155
treece90013eec444b843ce3de1e05f6470773a4c83b
parent10ee08b7570dde2bac77d3f96eca2ce630a32b49
parent9f57bd4d6dc69a4e3bf43044fa00fcd24dd363e3
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: fix per_cpu_ptr_to_phys() handling of non-page-aligned addresses