From: Tejun Heo <tj@kernel.org>
Date: Tue, 5 Jan 2010 00:17:33 +0000 (+0900)
Subject: Merge branch 'master' into percpu
X-Git-Tag: v2.6.34-rc1~223^2~11
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32032df6c2f6c9c6b2ada2ce42322231824f70c2;p=pandora-kernel.git

Merge branch 'master' into percpu

Conflicts:
	arch/powerpc/platforms/pseries/hvCall.S
	include/linux/percpu.h
---

32032df6c2f6c9c6b2ada2ce42322231824f70c2
Reading git-diff-tree failed