tree b1ce838a37044bb38dfc128e2116ca35630e629a
parent 22b737f4c75197372d64afc6ed1bccd58c00e549
parent c5974b835a909ff15c3b7e6cf6789b5eb919f419
author Tejun Heo <tj@kernel.org> 1262650653 +0900
committer Tejun Heo <tj@kernel.org> 1262650653 +0900

Merge branch 'master' into percpu

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