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)
* '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


Trivial merge