From: Lijun Pan Date: Fri, 15 Nov 2013 23:28:20 +0000 (-0600) Subject: powerpc/85xx: Merge 85xx/p1023_defconfig into mpc85xx_smp and mpc85xx X-Git-Tag: v3.14-rc1~80^2~5^2~35 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d73eb69fb6dca340e027b9b7a063b2892756a57;p=pandora-kernel.git powerpc/85xx: Merge 85xx/p1023_defconfig into mpc85xx_smp and mpc85xx mpc85xx_smp_defconfig and mpc85xx_defconfig already have CONFIG_P1023RDS=y. Merge CONFIG_P1023RDB=y and other relevant configurations into mpc85xx_smp_defconfig and mpc85_defconfig. Signed-off-by: Lijun Pan Signed-off-by: Scott Wood --- Reading git-diff-tree failed