Compare: 08b84f50cab2b9a9a4c7 vs a07bbb954b0cacb7f77f

kisskb

Description:	Fix minor merge conflict difference	Merge branch 'powerpc-next'
Date:	July 23, 2008, 1:08 a.m.	May 13, 2008, 3:02 a.m.
Hash:	08b84f50cab2b9a9a4c7822fe6211230d7179072	a07bbb954b0cacb7f77f5734d0cece50e8f780a0
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)	6dc6451153a3766385d6 (compare)
Next:	48a5bbac108bc291bff0 (compare)	09c2923d35eb841c6abc (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Jul 23 2008, 01:31	galak/mpc885_ads_defconfig/default	OK	May 13 2008, 03:20	galak/mpc885_ads_defconfig/default
Failed	Jul 23 2008, 01:22	galak/powerpc-allmodconfig/default	OK	May 13 2008, 03:10	galak/powerpc-allmodconfig/default
Failed	Jul 23 2008, 01:16	galak/ppc64_defconfig/default	OK	May 13 2008, 03:07	galak/ppc64_defconfig/default
Failed	Jul 23 2008, 01:13	galak/iseries_defconfig/default	OK	May 13 2008, 03:05	galak/iseries_defconfig/default
Failed	Jul 23 2008, 01:11	galak/cell_defconfig/default	OK	May 13 2008, 03:04	galak/cell_defconfig/default
Failed	Jul 23 2008, 01:08	galak/pseries_defconfig/default	OK	May 13 2008, 03:02	galak/pseries_defconfig/default

Status	Date/time	Target	Status	Date/time	Target
OK	Jul 23 2008, 01:28	galak/mpc85xx_defconfig/default	Failed	May 13 2008, 03:17	galak/mpc85xx_defconfig/default