From: Tejun Heo <tj@kernel.org>
Date: Wed, 4 Jun 2014 16:50:14 +0000 (-0400)
Subject: Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~84^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=315c5554c406fdad404a99dfefc931db0df80692;p=pandora-kernel.git

Merge branch 'for-3.15-fixes' of git://git./linux/kernel/git/tj/percpu.git into for-3.16

Pull percpu/for-3.15-fixes into percpu/for-3.16 to receive
0c36b390a546 ("percpu-refcount: fix usage of this_cpu_ops").

The merge doesn't produce any conflict but the automatic merge is
still incorrect because 4fb6e25049cb ("percpu-refcount: implement
percpu_ref_tryget()") added another use of __this_cpu_inc() which
should also be converted to this_cpu_ince().

This commit pulls in percpu/for-3.15-fixes and converts the newly
added __this_cpu_inc() to this_cpu_inc().

Signed-off-by: Tejun Heo <tj@kernel.org>
---

315c5554c406fdad404a99dfefc931db0df80692
Reading git-diff-tree failed