From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 May 2012 18:06:07 +0000 (-0700)
Subject: Merge branch 'for-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: v3.4-rc7~27
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e9b19cd43f3f55a7f1d1c9a033feda8dabce3be6;p=~emulex%2Finfiniband.git

Merge branch 'for-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

Pull two percpu fixes from Tejun Heo:
 "One adds missing KERN_CONT on split printk()s and the other makes
  the percpu allocator avoid using PMD_SIZE as atom_size on x86_32.

  Using PMD_SIZE led to vmalloc area exhaustion on certain
  configurations (x86_32 android) and the only cost of using PAGE_SIZE
  instead is static percpu area not being aligned to large page
  mapping."

* 'for-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu, x86: don't use PMD_SIZE as embedded atom_size on 32bit
  percpu: use KERN_CONT in pcpu_dump_alloc_info()
---

e9b19cd43f3f55a7f1d1c9a033feda8dabce3be6