Merge branch 'ppc_kconfig' of master.kernel.org:/pub/scm/linux/kernel/git/galak/power...