From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 May 2011 18:53:42 +0000 (-0700)
Subject: Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
X-Git-Tag: v3.0-rc1~315
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5129df03d0c44b2d5a5f9d7d52f3b079706b9a8f;p=pandora-kernel.git

Merge branch 'for-2.6.40' of git://git./linux/kernel/git/tj/percpu

* 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu: Unify input section names
  percpu: Avoid extra NOP in percpu_cmpxchg16b_double
  percpu: Cast away printk format warning
  percpu: Always align percpu output section to PAGE_SIZE

Fix up fairly trivial conflict in arch/x86/include/asm/percpu.h as per Tejun
---

5129df03d0c44b2d5a5f9d7d52f3b079706b9a8f
Reading git-diff-tree failed