Compare: 08b84f50cab2b9a9a4c7 vs 032190085cdcde333e8d

kisskb

Description:	Fix minor merge conflict difference	Merge branch 'powerpc-next'
Date:	July 23, 2008, 1:08 a.m.	Aug. 30, 2008, 12:10 a.m.
Hash:	08b84f50cab2b9a9a4c7822fe6211230d7179072	032190085cdcde333e8de866c75a9f13d2b19c70
Branches:	galak	galak
Gitweb:	git.kernel.org	git.kernel.org
Progress:	0% 13/0	0% 14/0
Successful:	53% 7/13	100% 14/14
Previous:	e6a2a8e701a38ed1c324 (compare)	6046811ef1240fa38674 (compare)
Next:	48a5bbac108bc291bff0 (compare)	ca7e4abbc84d89848a72 (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Jul 23 2008, 01:31	galak/mpc885_ads_defconfig/default	OK	Aug 30 2008, 00:48	galak/mpc885_ads_defconfig/default
Failed	Jul 23 2008, 01:22	galak/powerpc-allmodconfig/default	OK	Aug 30 2008, 00:26	galak/powerpc-allmodconfig/default
Failed	Jul 23 2008, 01:16	galak/ppc64_defconfig/default	OK	Aug 30 2008, 00:19	galak/ppc64_defconfig/default
Failed	Jul 23 2008, 01:13	galak/iseries_defconfig/default	OK	Aug 30 2008, 00:16	galak/iseries_defconfig/default
Failed	Jul 23 2008, 01:11	galak/cell_defconfig/default	OK	Aug 30 2008, 00:13	galak/cell_defconfig/default
Failed	Jul 23 2008, 01:08	galak/pseries_defconfig/default	OK	Aug 30 2008, 00:10	galak/pseries_defconfig/default