From: Linus Torvalds Date: Thu, 10 Mar 2011 00:46:06 +0000 (-0800) Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=35d34df711e8b44846e759d8cfddb4ec6877cccb;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/pseries: Disable VPNH feature powerpc/iseries: Fix early init access to lppaca --- 35d34df711e8b44846e759d8cfddb4ec6877cccb