Compare: 08b84f50cab2b9a9a4c7 vs 09c2923d35eb841c6abc

kisskb

Description:	Fix minor merge conflict difference	Merge branch 'powerpc-next'
Date:	July 23, 2008, 1:08 a.m.	May 14, 2008, 1:02 a.m.
Hash:	08b84f50cab2b9a9a4c7822fe6211230d7179072	09c2923d35eb841c6abc68947cfd216b510d9f27
Branches:	galak	galak
Gitweb:	git.kernel.org	git.kernel.org
Progress:	0% 13/0	0% 13/0
Successful:	53% 7/13	92% 12/13
Previous:	e6a2a8e701a38ed1c324 (compare)	a07bbb954b0cacb7f77f (compare)
Next:	48a5bbac108bc291bff0 (compare)	0888ae5ee35346501eb8 (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Jul 23 2008, 01:31	galak/mpc885_ads_defconfig/default	OK	May 14 2008, 01:30	galak/mpc885_ads_defconfig/default
Failed	Jul 23 2008, 01:22	galak/powerpc-allmodconfig/default	OK	May 14 2008, 01:18	galak/powerpc-allmodconfig/default
Failed	Jul 23 2008, 01:16	galak/ppc64_defconfig/default	OK	May 14 2008, 01:11	galak/ppc64_defconfig/default
Failed	Jul 23 2008, 01:13	galak/iseries_defconfig/default	OK	May 14 2008, 01:09	galak/iseries_defconfig/default
Failed	Jul 23 2008, 01:11	galak/cell_defconfig/default	OK	May 14 2008, 01:06	galak/cell_defconfig/default
Failed	Jul 23 2008, 01:08	galak/pseries_defconfig/default	OK	May 14 2008, 01:01	galak/pseries_defconfig/default

Status	Date/time	Target	Status	Date/time	Target
OK	Jul 23 2008, 01:28	galak/mpc85xx_defconfig/default	Failed	May 14 2008, 01:26	galak/mpc85xx_defconfig/default